Merge branch 'patch-2' of git://github.com/icecaster/sapphire into icecaster-patch-2

This commit is contained in:
Ingo Schommer 2012-11-09 10:29:38 +01:00
commit e9a544b719

View File

@ -278,8 +278,8 @@ class HtmlEditorField_Toolbar extends RequestHandler {
public function forTemplate() { public function forTemplate() {
return sprintf( return sprintf(
'<div id="cms-editor-dialogs" data-url-linkform="%s" data-url-mediaform="%s"></div>', '<div id="cms-editor-dialogs" data-url-linkform="%s" data-url-mediaform="%s"></div>',
Controller::join_links($this->controller->Link($this->name), 'LinkForm', 'forTemplate'), Controller::join_links($this->controller->Link(), $this->name, 'LinkForm', 'forTemplate'),
Controller::join_links($this->controller->Link($this->name), 'MediaForm', 'forTemplate') Controller::join_links($this->controller->Link(), $this->name, 'MediaForm', 'forTemplate')
); );
} }