a whole pile of bug fixes

docs/changelog/6.x.x.txt

@@ -2,6 +2,25 @@
  - Fixed a bug in the collaboration system that caused replies to fail.
  - Fixed an inefficency in the asset system that caused a lot of extra work on
    the server when pasting.
+ - Fixed a bug in the groups system where group expiration intervals weren't
+   saving properly.
+ - fix [ 1170879 ] "default extension" is added to asset's URL upon every Save
+ - fix [ 1170200 ] folder view template file_loop -> always current time
+ - fix [ 1170650 ] Group problem
+ - fix [ 1170245 ] paste returns deleted content
+ - Fixed a problem with the FormProcessor url sub that wouldn't allow URLs to
+   start with / or a macro.
+ - fix [ 1171447 ] Poll shows no result
+ - fix [ 1171060 ] delete file from cs
+ - fix [ 1170290 ] 6.2.x->6.5.4 doesn't add Page macro to config file
+ - fix [ 1171469 ] [edited] post insert wrong timezone
+ - Updated the macro picker in the rich editor.
+ - fix [ 1171505 ] Previewing a post appends signature every time.
+ - fix [ 1170095 ] Sort-by fields don't.
+ - fix [ 1165645 ] Search not working
+ - fix [ 1170264 ] can't copy file
+ - fix [ 1170242 ] cs email url
+ - fix [ 1171110 ] nav ancestor
 
 
 6.5.4 

docs/upgrades/upgrade_6.2.11-6.3.0.pl

@@ -1616,6 +1616,7 @@ $macros->{"AssetProxy"} = "AssetProxy";
 $macros->{"RandomAssetProxy"} = "RandomAssetProxy";
 $macros->{"FileUrl"} = "FileUrl";
 $macros->{"PageUrl"} = "PageUrl";
+$macros->{"Page"} = "Page";
 $conf->set("paymentPlugins"=>"ITransact");
 $conf->set("macros"=>$macros);
 $conf->set("assets"=>[

docs/upgrades/upgrade_6.5.4-6.5.5.pl

@@ -0,0 +1,42 @@
+#!/usr/bin/perl
+
+use lib "../../lib";
+use File::Path;
+use Getopt::Long;
+use strict;
+use WebGUI::Session;
+use WebGUI::SQL;
+
+my $configFile;
+my $quiet;
+
+GetOptions(
+    'configFile=s'=>\$configFile,
+	'quiet'=>\$quiet
+);
+
+WebGUI::Session::open("../..",$configFile);
+
+#--------------------------------------------
+print "\tPartitioning limbo\n" unless ($quiet);
+my $sth = WebGUI::SQL->read("select lineage from asset where state='trash'");
+while (my ($lineage) = $sth->array) {
+	WebGUI::SQL->write("update asset set state='trash-limbo' where lineage like ".quote($lineage.'%')." and state='limbo'");
+}
+$sth->finish;
+WebGUI::SQL->write("update asset set state='clipboard-limbo' where state='limbo'");
+
+
+#--------------------------------------------
+print "\tRemoving old files\n" unless ($quiet);
+# should have been removed in the 6.2-6.3 upgrade
+unlink("../../sbin/Hourly/EmptyTrash.pm");
+unlink("../../lib/WebGUI/Wobject/IndexedSearch.pm");
+rmtree("../../lib/WebGUI/Wobject/IndexedSearch");
+unlink("../../lib/WebGUI/Wobject/Product.pm");
+unlink("../../lib/WebGUI/Wobject/SyndicatedContent.pm");
+unlink("../../lib/WebGUI/Wobject/Survey.pm");
+
+WebGUI::Session::close();
+
+