From 45e34d4255e5a1b90cf93739e836953b81c5793d Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Sat, 13 Dec 2008 02:41:00 +0000 Subject: [PATCH] BUGFIX: Updated CMS to support HtmlEditorField changes in r68701 git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@68702 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/CMSMain.php | 1 + code/ReportAdmin.php | 1 + 2 files changed, 2 insertions(+) diff --git a/code/CMSMain.php b/code/CMSMain.php index 5187e1e6..61b9d26c 100644 --- a/code/CMSMain.php +++ b/code/CMSMain.php @@ -92,6 +92,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr // We don't want this showing up in every ajax-response, it should always be present in a CMS-environment if(!Director::is_ajax()) { Requirements::javascript(MCE_ROOT . "tiny_mce_src.js"); + Requirements::block(SAPPHIRE_DIR . '/javascript/HtmlEditorField.js'); Requirements::javascriptTemplate(CMS_DIR . "/javascript/tinymce.template.js", array( "ContentCSS" => (SSViewer::current_theme() ? THEMES_DIR . "/" . SSViewer::current_theme() : project()) . "/css/editor.css", "BaseURL" => Director::absoluteBaseURL(), diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php index 258098cd..b44a9b0a 100755 --- a/code/ReportAdmin.php +++ b/code/ReportAdmin.php @@ -33,6 +33,7 @@ class ReportAdmin extends LeftAndMain { // always be present in a CMS environment if(!Director::is_ajax()) { Requirements::javascript(MCE_ROOT . "tiny_mce_src.js"); + Requirements::block(SAPPHIRE_DIR . '/javascript/HtmlEditorField.js'); Requirements::javascriptTemplate(CMS_DIR . '/javascript/tinymce.template.js', array( 'ContentCSS' => project() . '/css/editor.css', 'BaseURL' => Director::absoluteBaseURL(),