#369115 by sun: Fixed TinyMCE's URL conversion magic breaks some input filters.

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 8756394..5e51573 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 6.x-1.x, xxxx-xx-xx
 ---------------------------
+#369115 by sun: Fixed TinyMCE's URL conversion magic breaks some input filters.
 #376400 by TwoD: Fixed bad grammar in help text on profile overview page.
 #367632 by sun: Fixed $this and i JavaScript variables defined in global scope.
 

diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index 026fe09..499f261 100644 (file)
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -113,10 +113,14 @@ function wysiwyg_tinymce_settings($editor, $config, $theme) {
     'document_base_url' => base_path(),
     'mode' => 'none',
     'plugins' => array(),
-    'relative_urls' => FALSE,
     'theme' => $theme,
     'width' => '100%',
+    // Strict loading mode must be enabled; otherwise TinyMCE would use
+    // document.write() in IE and Chrome.
     'strict_loading_mode' => TRUE,
+    // TinyMCE's URL conversion magic breaks Drupal modules that use a special
+    // syntax for paths. This makes 'relative_urls' obsolete.
+    'convert_urls' => FALSE,
   );
   if (isset($config['apply_source_formatting'])) {
     $init['apply_source_formatting'] = $config['apply_source_formatting'];