From 99d96a6a829dd4616ff977176520bf159561a14b Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Thu, 10 Apr 2008 22:14:56 +0000 Subject: [PATCH] fixed: gateway macro not usable in links in rich editor --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Asset/RichEdit.pm | 2 +- www/extras/tinymce-webgui/callbacks.js | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index e2bdd2253..5fd31e858 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -21,6 +21,7 @@ - fixed: able to view visitor profile, send private messages, add as friend - fixed: international characters corrupted in titles - fixed: Users without karma can transfer karma by rating posts + - fixed: gateway macro not usable in links in rich editor 7.5.9 - fixed: Collaboration System attachments follow site's max size instead of CS's diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm index e1726bb89..83cb0b741 100644 --- a/lib/WebGUI/Asset/RichEdit.pm +++ b/lib/WebGUI/Asset/RichEdit.pm @@ -464,7 +464,7 @@ sub getRichEditor { remove_script_host => JSON::true(), auto_reset_designmode => JSON::true(), cleanup_callback => "tinyMCE_WebGUI_Cleanup", - urlconvertor_callback => "tinyMCE_WebGUI_URLConvertor", + urlconverter_callback => "tinyMCE_WebGUI_URLConvertor", theme_advanced_resizing => JSON::true(), (map { "theme_advanced_buttons".($_+1) => (join ',', @{$toolbarRows[$_]}) } (0..$#toolbarRows)), diff --git a/www/extras/tinymce-webgui/callbacks.js b/www/extras/tinymce-webgui/callbacks.js index 358301d39..f23b2f522 100644 --- a/www/extras/tinymce-webgui/callbacks.js +++ b/www/extras/tinymce-webgui/callbacks.js @@ -1,7 +1,6 @@ // WebGUI Specific javascript functions for TinyMCE function tinyMCE_WebGUI_URLConvertor(url, node, on_save) { - url = tinyMCE.convertURL(url, node, on_save); // Do custom WebGUI convertion, replace back ^(); // turn escaped macro characters back into the real thing