Branch 'roundcubemail-plugins-kolab-0.7' - plugins/tinymce_config

[Aleksander Machniak]

 plugins/tinymce_config/tinymce_config.php |   10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

New commits:
commit d0bce4bffa4635126428f87d3c1f5c2fb7fefdb2
Author: Aleksander Machniak (Kolab Systems) <machniak at kolabsys.com>
Date:   Fri Oct 12 15:01:33 2012 +0200

    Add real fix for Roundcube 0.7

diff --git a/plugins/tinymce_config/tinymce_config.php b/plugins/tinymce_config/tinymce_config.php
index e30f72e..faa17f3 100644
--- a/plugins/tinymce_config/tinymce_config.php
+++ b/plugins/tinymce_config/tinymce_config.php
@@ -39,15 +39,9 @@ class tinymce_config extends rcube_plugin
         'force_br_newlines' => true,
     );
 
-    $script = sprintf('
-        if (!window.rcmail_editor_settings)
-          window.rcmail_editor_settings = {};
-        var tinymce_config = %s;
-        for (var i in tinymce_config)
-          window.rcmail_editor_settings[i] = tinymce_config[i];
-    ', json_encode($config));
+    $script = sprintf('$.extend(window.rcmail_editor_settings, %s);', json_encode($config));
 
-    $rcmail->output->add_script($script, 'docready');
+    $rcmail->output->add_script($script, 'foot');
   }
 }