mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
BUGFIX #5255 LeftAndMain should include the correct editor.css file so typography from user selected theme in SiteConfig is shown in TinyMCE (from r102038)
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@111651 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
ba7955862b
commit
3a7b510127
@ -169,7 +169,17 @@ class LeftAndMain extends Controller {
|
||||
$htmlEditorConfig = HtmlEditorConfig::get_active();
|
||||
if(!$htmlEditorConfig->getOption('content_css')) {
|
||||
$cssFiles = 'cms/css/editor.css';
|
||||
if(SSViewer::current_theme()) $cssFiles .= ', ' . THEMES_DIR . "/" . SSViewer::current_theme() . '/css/editor.css';
|
||||
|
||||
// Use theme from the site config
|
||||
if(($config = SiteConfig::current_site_config()) && $config->Theme) {
|
||||
$theme = $config->Theme;
|
||||
} elseif(SSViewer::current_theme()) {
|
||||
$theme = SSViewer::current_theme();
|
||||
} else {
|
||||
$theme = false;
|
||||
}
|
||||
|
||||
if($theme) $cssFiles .= ', ' . THEMES_DIR . "/{$theme}/css/editor.css";
|
||||
else if(project()) $cssFiles .= ', ' . project() . '/css/editor.css';
|
||||
|
||||
$htmlEditorConfig->setOption('content_css', $cssFiles);
|
||||
|
Loading…
Reference in New Issue
Block a user