From 034490811d97e14a99499497b9a363cc26f6dfbf Mon Sep 17 00:00:00 2001 From: Aaron Carlino Date: Fri, 30 Jun 2017 21:02:42 +1200 Subject: [PATCH 1/2] Set user themes on TinyMCEConfig before overwriting with admin themes --- code/LeftAndMain.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 948ea7829..b46da9f7b 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -663,6 +663,10 @@ protected function init() $dummy = null; $this->extend('init', $dummy); + // Load the editor with original user themes before overwriting + // them with admin themes + TinyMCEConfig::set_user_themes(SSViewer::get_themes()); + // Assign default cms theme and replace user-specified themes SSViewer::set_themes(LeftAndMain::config()->uninherited('admin_themes')); From a484718a962b4c501e6907628a342051df8281dc Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Mon, 3 Jul 2017 10:40:08 +1200 Subject: [PATCH 2/2] =?UTF-8?q?Ensure=20editor=20themes=20aren=E2=80=99t?= =?UTF-8?q?=20overwritten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/LeftAndMain.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index b46da9f7b..3f96c3f4a 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -665,7 +665,10 @@ protected function init() // Load the editor with original user themes before overwriting // them with admin themes - TinyMCEConfig::set_user_themes(SSViewer::get_themes()); + $themes = HTMLEditorConfig::config()->get('user_themes'); + if (empty($themes)) { + HTMLEditorConfig::config()->set('user_themes', SSViewer::get_themes()); + } // Assign default cms theme and replace user-specified themes SSViewer::set_themes(LeftAndMain::config()->uninherited('admin_themes'));