tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8 from christopherdarling/patch-1

Browse Source 
FIX: HtmlEditorConfig should be using content_css
This commit is contained in:
Will Rossiter 2015-10-27 09:17:24 +13:00
commit d71c638e0d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/ReportAdmin.php
View File

@ -47,7 +47,7 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
$this->reportObject = (isset($allReports[$this->reportClass])) ? $allReports[$this->reportClass] : null;
// Set custom options for TinyMCE specific to ReportAdmin
HtmlEditorConfig::get('cms')->setOption('ContentCSS', project() . '/css/editor.css');
HtmlEditorConfig::get('cms')->setOption('content_css', 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
@ -186,4 +186,4 @@ class ReportAdmin extends LeftAndMain implements PermissionProvider {
return $form;
}
}
}