some holdovers

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] <mwilson's fixes>
  - fix [ 1173544 ] Rating increases view count [mwilson]
  - fix [ 1177020 ] Preview, then Save a Post -subscribers get two notifications

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

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; 
+alter table groups add ldapRecursiveProperty varchar(255) default NULL; >>>>>>> 1.4

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),

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"),'"');
+}