bug fixes and preparing for 5.5.0 release

docs/changelog/5.x.x.txt

@@ -15,6 +15,7 @@
  - Added support for record deletion in DataForm (Thanks to Hal Roberts.)
  - Templatized the HttpProxy wobject. (Thanks to Len Kranendonk.)
  - Added a "Search for" and "Stop at" option to HttpProxy. (Thanks to Len Kranendonk.)
+ - Added additional DSN formats for upgrades of remote databases.
  - Enhanced HTMLArea editor to include table editing. (Thanks to Irving Carrion.)
  - If the Cache Timeout on a given page is set to 10 seconds or less, that
    page will not be cached.
@@ -23,6 +24,7 @@
  - Updated the Spanish translation. (Thanks to GIT Consultors.) 
  - Updated the German translation. (Thanks to Andreas Graf.)
  - Updated the Norwegian translation. (Thanks to Nils-Magne Kvammen.)
+ - Added the missing group scratch filter documentation to the help.
  - Fixed a bug in the 5.4.3-5.4.4 upgrade script that some users experienced
    with null values in their DataForm.
  - Fixed a relative hyperlink bug in htmlArea (Thanks to Andreas Graf.)

lib/WebGUI/Operation/Package.pm

@@ -76,7 +76,9 @@ sub _recursePageTree {
 			userDefined4,
 			userDefined5,
 			hideFromNavigation,
-			newWindow
+			newWindow,
+			cacheTimeout,
+			cacheTimeoutVisitor
 			) values (
 			$newPageId,
 			$_[1],
@@ -101,7 +103,9 @@ sub _recursePageTree {
 			".quote($newParent{userDefined4}).",
 			".quote($newParent{userDefined5}).",
 			$package{hideFromNavigation},
-			$package{newWindow}
+			$package{newWindow},
+			$package{cacheTimeout},
+			$package{cacheTimeoutVisitor}
 			)");
 		_recursePageTree($package{pageId},$newPageId);
 	}

lib/WebGUI/Session.pm

@@ -473,7 +473,7 @@ Defaults to page id "1". Specify the page id to change this WebGUI session to us
 sub refreshPageInfo {
 	my ($pageId);
 	if ($_[0] == 0) {
-		$pageId = 1;
+		$pageId = $session{page}{pageId};
 	} else {
 		$pageId = $_[0];
 	}

sbin/upgrade.pl

@@ -174,10 +174,23 @@ foreach my $file (@files) {
                 	'FILE' => $configsPath.$config{$file}{configFile},
                 	'PURGE' => 1);
 		$config{$file}{dsn} = $config->get('dsn');
-		$config{$file}{dsn} =~ /^DBI\:(\w+)\:(\w+)(\:(.*)|)$/;
+		my $temp = $config{$file}{dsn};
+		$temp =~ s/^DBI\:(.*)$/$1/;
+		$temp =~ s/(\w+)\:(.*)/$2/;
+		#$config{$file}{dsn} =~ /^DBI\:(\w+)\:(\w+)(\:(.*)|)$/;
 		if ($1 eq "mysql") {
-			$config{$file}{db} = $2;
-			$config{$file}{host} = $4;
+			if ($temp =~ /(\w+)\;host=(.*)/) {
+				$config{$file}{db} = $1;
+				$config{$file}{host} = $2;
+			} elsif ($temp =~ /(\w+)\;(.*)/) {
+				$config{$file}{db} = $1;
+				$config{$file}{host} = $2;
+			} elsif ($temp =~ /(\w+)\:(.*)/) {
+				$config{$file}{db} = $1;
+				$config{$file}{host} = $2;
+			} else {
+				$config{$file}{db} = $temp;
+			}
 			$config{$file}{dbuser} = $config->get('dbuser');
 			$config{$file}{dbpass} = $config->get('dbpass');
 			$config{$file}{mysqlCLI} = $config->get('mysqlCLI');