merging 6.6.5 changes

docs/changelog/6.x.x.txt

@@ -41,6 +41,16 @@
    time ago, but the documentation was never updated until now.
 
 
+6.6.5
+ - fix [ 1243131 ] In 6.6.4 you cannot upload anything (ebruni/mwilson)
+ - fix [ 1243392 ] demo.plainblack.com: Cannot manage users in group (mwilson)
+ - fix [ 1240325 ] FilePile doesn't create thumbnail when upload images
+   (mwilson)
+ - fix [ 1240324 ] Folder.pm error evaluating $isImage (ebruni)
+ - fix [ 1240140 ] Database link username in 6.6.3 is wrong (mwilson)
+ - Fixed a bug where HTTP Proxy asset couldn't proxy images properly.
+
+
 6.6.4
  - fix [ 1238539 ] REQUEST_URI broken in WRE
  - fix [ 1227887 ] setScratch("redirectAfterLogin") doesn't save

docs/upgrades/upgrade_6.6.4-6.6.5.pl

@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+
+use lib "../../lib";
+use Getopt::Long;
+use strict;
+use File::Path;
+
+my $configFile;
+my $quiet;
+
+GetOptions(
+    'configFile=s'=>\$configFile,
+	'quiet'=>\$quiet
+);
+
+
+#--------------------------------------------
+print "\tRemoving old HTML::Template if it exists. Check gotcha.txt for details.\n" unless ($quiet);
+rmtree("../../lib/HTML/Template");
+unlink("../../lib/HTML/Template.pm");
+
+
+

docs/upgrades/upgrade_6.6.4-6.6.5.sql

@@ -0,0 +1,2 @@
+insert into webguiVersion values ('6.6.5','upgrade',unix_timestamp());
+