Fixed an upgrade problem from 4.5.0-4.6.0 and added more debugging to macro compilation.

docs/create.sql

@@ -6937,7 +6937,7 @@ CREATE TABLE webguiVersion (
 --
 
 
-INSERT INTO webguiVersion VALUES ('4.6.2','initial install',unix_timestamp());
+INSERT INTO webguiVersion VALUES ('4.6.3','initial install',unix_timestamp());
 
 --
 -- Table structure for table 'wobject'

docs/gotcha.txt

@@ -7,6 +7,17 @@ upgrading from one version to the next, or even between multiple
 versions. Be sure to heed the warnings contained herein as they will
 save you many hours of grief.
 
+4.6.3
+--------------------------------------------------------------------
+ * It has been reported that some people had a duplicate key error
+	when upgrading from 4.5.0 to 4.6.0. This version has removed
+	the possibility of that problem. The error actually didn't
+	cause anything more than cosmetic problems. You have the
+	choice of restoring to a backup version and reapplying the
+	patches, or just moving forward. Either way will produce
+	the same result.
+
+
 4.6.0
 --------------------------------------------------------------------
  * The runHourly scheduler has been updated to allow for more

docs/upgrades/upgrade_4.6.2-4.6.3.sql

@@ -0,0 +1,13 @@
+insert into webguiVersion values ('4.6.3','upgrade',unix_timestamp());
+delete from international where internationalId=716 and namespace='WebGUI' and languageId=1;
+delete from international where internationalId=717 and namespace='WebGUI' and languageId=1;
+insert into international values (716,'WebGUI',1,'Login');
+insert into international values (717,'WebGUI',1,'Logout');
+delete from international where internationalId=624 and namespace='WebGUI' and languageId=1;
+
+
+
+
+
+
+

lib/WebGUI.pm

@@ -1,5 +1,5 @@
 package WebGUI;
-our $VERSION = "4.6.2";
+our $VERSION = "4.6.3";
 
 #-------------------------------------------------------------------
 # WebGUI is Copyright 2001-2002 Plain Black LLC.

lib/WebGUI/Session.pm

@@ -118,7 +118,7 @@ sub _loadMacros {
 			$namespace = $1;
 			$cmd = "use WebGUI::Macro::".$1;
 			eval($cmd);
-			WebGUI::ErrorHandler::fatalError("Macro failed to compile: $namespace.") if($@);
+			WebGUI::ErrorHandler::fatalError("Macro failed to compile: $namespace.".$@) if($@);
 			$exclude = $session{config}{excludeMacro};
                         $exclude =~ s/ //g;
                         unless (isIn($namespace, split(/,/,$exclude))) {