From 6c3a3677fe5767e1acf75c95eec9ec3997d7db17 Mon Sep 17 00:00:00 2001 From: Sean Harvey Date: Fri, 15 May 2009 00:08:23 +0000 Subject: [PATCH] BUGFIX Fixed missing tinymce_template bug in ReportAdmin git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@76913 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/ReportAdmin.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/code/ReportAdmin.php b/code/ReportAdmin.php index c512b3d8..cc34ccca 100755 --- a/code/ReportAdmin.php +++ b/code/ReportAdmin.php @@ -33,12 +33,10 @@ class ReportAdmin extends LeftAndMain { // always be present in a CMS environment if(!Director::is_ajax()) { Requirements::javascript(MCE_ROOT . "tiny_mce_src.js"); - Requirements::javascriptTemplate(CMS_DIR . '/javascript/tinymce.template.js', array( - 'ContentCSS' => project() . '/css/editor.css', - 'BaseURL' => Director::absoluteBaseURL(), - 'Lang' => i18n::get_tinymce_lang() - )); + HtmlEditorConfig::get('cms')->setOption('ContentCSS', project() . '/css/editor.css'); + HtmlEditorConfig::get('cms')->setOption('Lang', i18n::get_tinymce_lang()); } + // Always block the HtmlEditorField.js otherwise it will be sent with an ajax request Requirements::block(SAPPHIRE_DIR . '/javascript/HtmlEditorField.js'); }