summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.txt1
-rw-r--r--editors/tinymce.inc1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 16dc501..6407cdc 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 5.x-1.x, xxxx-xx-xx
---------------------------
+#352938 by sun: Fixed JS error (blank page) in IE when plugins are loaded.
#331089 by wwalc, sun: Added custom toolbar configuration support for FCKeditor.
#331089 by sun: Fixed PHP notice for 'user_choose'; FCKeditor clean-up.
#344230 by wwalc: Fixed wrong editor base path setting for FCKeditor.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index c18cae7..6214a7e 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -117,6 +117,7 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
'relative_urls' => FALSE,
'theme' => $theme,
'width' => '100%',
+ 'strict_loading_mode' => TRUE,
);
if (isset($config['apply_source_formatting'])) {
$init['apply_source_formatting'] = $config['apply_source_formatting'];