rich editor is now working

docs/changelog/6.x.x.txt

@@ -53,6 +53,7 @@
    for more familiarity with mac users.
  - Added "create shortcut" as a context menu option in the asset manager.
  - Fixed generateContent.pl to work with the new asset tree.
+ - Updated TinyMCE to version 1.44.
 
 
 6.5.6

docs/upgrades/upgrade_6.5.6-6.6.0.pl

@@ -245,9 +245,9 @@ $importNode->addChild({
 	ownerUserId=>3,
 	groupIdView=>12,
 	groupIdEdit=>4,
-	toolbarRow1=>"bold\nitalic\njustifyleft\njustifyright\njustifycenter\njustifyfull\nindent\noutdent\nstyleselect\nremoveformat",
-	toolbarRow2=>"bullist\nnumlist\nsub\nsup\nlink\npagetree\nanchor\nunlink\nadvhr\nimage\ninsertImage\ncharmap\ncollateral",
-	toolbarRow3=>"tablecontrols\nvisualaid\npreview\nsource\nsearchreplace",
+	toolbarRow1=>"bold\nitalic\njustifyleft\njustifyright\njustifycenter\njustifyfull\nindent\noutdent\nsub\nsup\nformatselect\nremoveformat",
+	toolbarRow2=>"bullist\nnumlist\nlink\npagetree\nanchor\nunlink\nadvhr\nimage\ninsertImage\ncharmap\ncollateral",
+	toolbarRow3=>"tablecontrols\nvisualaid\npreview\ncode\ncleanup\nreplace",
 	sourceEditorWidth=>600,
 	sourceEditorHeight=>500,
 	enableContextMenu=>1
@@ -260,7 +260,7 @@ $importNode->addChild({
 	ownerUserId=>3,
 	groupIdView=>7,
 	groupIdEdit=>4,
-	toolbarRow1=>"bold\nitalic\nbullist\nnumlist\nlink\nunlink\ncode\nemotions"
+	toolbarRow1=>"bold\nitalic\nbullist\nnumlist\nlink\nunlink\nemotions"
 	},"PBrichedit000000000002");
 
 

docs/upgrades/upgrade_6.5.6-6.6.0.sql

@@ -51,14 +51,13 @@ alter table transaction add column trackingNumber varchar(255);
 create table RichEdit (
 	assetId varchar(22) not null primary key,
                         askAboutRichEdit int not null default 0,
-                        preformated int not null default 0,
+                        preformatted int not null default 0,
                         editorWidth int not null default 0,
                         editorHeight int not null default 0,
                         sourceEditorWidth int not null default 0,
                         sourceEditorHeight int not null default 0,
                         useBr int not null default 0,
 			nowrap int not null default 0,
-                        convertNewLinesToBr int not null default 0,
                         removeLineBreaks int not null default 0,
                         npwrap int not null default 0,
                         directionality varchar(3) not null default 'ltr',