#781086 by TwoD: Fixed TinyMCE plugin options merged wrongly.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index b8dc734..74f92c6 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 6.x-2.x, xxxx-xx-xx
 ---------------------------
+#781086 by TwoD: Fixed TinyMCE plugin options merged wrongly.
 #767628 by TwoD: Fixed 'The version of markItUp could not be detected' error.
 #651490 by TwoD: Fixed Whizzywig width.
 #715228 by TwoD: Fixed TinyMCE image popups not launching for existing images.

diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index d8bc1e3..dcd0134 100644 (file)
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -294,11 +294,9 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
   unset($settings['buttons']);
 
   // Convert the config values into the form expected by TinyMCE.
-  foreach ($settings as $key => $value) {
-    if (is_bool($value)) {
-      continue;
-    }
-    if (is_array($value)) {
+  $csv_settings = array('plugins', 'extended_valid_elements', 'theme_advanced_buttons1', 'theme_advanced_buttons2', 'theme_advanced_buttons3');
+  foreach ($csv_settings as $key) {
+    if (isset($settings[$key]) && is_array($settings[$key])) {
       $settings[$key] = implode(',', $settings[$key]);
     }
   }