From 0d8540bb024733d5e6148d2f861f8b646874344d Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 20 May 2005 19:06:52 +0000 Subject: [PATCH] some holdovers --- docs/changelog/6.x.x.txt | 1 + docs/gotcha.txt | 1 + docs/upgrades/upgrade_6.6.0-6.6.1.sql | 4 ++-- lib/WebGUI/Asset/RichEdit.pm | 1 + www/extras/tinymce/jscripts/webgui.js | 3 +++ 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 3bb119075..6822682f0 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -1,5 +1,6 @@ 6.6.1 - Replaced defective confirm checkout commerce template. + - Fixed a typo in the Navigation table schema. - fix [ 1160019 ] Notification content type [temp fix] - fix [ 1173544 ] Rating increases view count [mwilson] - fix [ 1177020 ] Preview, then Save a Post -subscribers get two notifications diff --git a/docs/gotcha.txt b/docs/gotcha.txt index 7fb1d31d7..8f11dc42a 100644 --- a/docs/gotcha.txt +++ b/docs/gotcha.txt @@ -16,6 +16,7 @@ save you many hours of grief. them using testEnvironment.pl The new modules you'll need to install are: + Log::Log4perl Net::LDAP Date::Manip DBIx::FullTextSearch diff --git a/docs/upgrades/upgrade_6.6.0-6.6.1.sql b/docs/upgrades/upgrade_6.6.0-6.6.1.sql index 339f14628..ec6525cc4 100644 --- a/docs/upgrades/upgrade_6.6.0-6.6.1.sql +++ b/docs/upgrades/upgrade_6.6.0-6.6.1.sql @@ -1,6 +1,6 @@ insert into webguiVersion values ('6.6.1','upgrade',unix_timestamp()); insert into settings values ('commerceSendDailyReportTo', ''); -ALTER TABLE navigation CHANGE COLUMN anscestorEndPoint ancestorEndPoint INTEGER NOT NULL DEFAULT 55; +alter table Navigation change anscestorEndPoint ancestorEndPoint int not null default 55; alter table groups add ldapGroup varchar(255) default NULL; alter table groups add ldapGroupProperty varchar(255) default NULL; -alter table groups add ldapRecursiveProperty varchar(255) default NULL; \ No newline at end of file +alter table groups add ldapRecursiveProperty varchar(255) default NULL; >>>>>>> 1.4 diff --git a/lib/WebGUI/Asset/RichEdit.pm b/lib/WebGUI/Asset/RichEdit.pm index d1a848cba..c91514544 100644 --- a/lib/WebGUI/Asset/RichEdit.pm +++ b/lib/WebGUI/Asset/RichEdit.pm @@ -412,6 +412,7 @@ sub getRichEditor { mode => "specific_textareas", theme => "advanced", document_base_url => "/", + cleanup_callback => "tinyMCE_WebGUI_Cleanup", urlconvertor_callback => "tinyMCE_WebGUI_URLConvertor", theme_advanced_buttons1 => join(",",@toolbarRow1), theme_advanced_buttons2 => join(",",@toolbarRow2), diff --git a/www/extras/tinymce/jscripts/webgui.js b/www/extras/tinymce/jscripts/webgui.js index f0ff302ee..e32461812 100644 --- a/www/extras/tinymce/jscripts/webgui.js +++ b/www/extras/tinymce/jscripts/webgui.js @@ -14,4 +14,7 @@ function tinyMCE_WebGUI_URLConvertor(url, node, on_save) { return url; } +function tinyMCE_WebGUI_Cleanup(content) { + return content.replace(new RegExp(""","g"),'"'); +}