Merge pull request silverstripe#132 from open-sausages/pulls/4.0/that…

…s-a-wrap Set user themes on TinyMCEConfig before overwriting with admin themes
unclecheese · Jul 2, 2017 · bc537c3 · bc537c3
2 parents e4b7697 + a484718
commit bc537c3
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
@@ -663,6 +663,13 @@ protected function init()
         $dummy = null;
         $this->extend('init', $dummy);
 
+        // Load the editor with original user themes before overwriting
+        // them with admin 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'));