From e03f754bcec18c652b39b3ab680cb5b480b8ac73 Mon Sep 17 00:00:00 2001
From: Colin Kuskie <colink@perldreamer.com>
Date: Wed, 19 May 2010 08:38:22 -0700
Subject: [PATCH] Fix the name of the ConvertUTCToTZ macro in config files. 
 Fixes bug #11576.

---
 docs/changelog/7.x.x.txt             |  1 +
 docs/upgrades/upgrade_7.9.5-7.9.6.pl | 13 +++++++++++++
 etc/WebGUI.conf.original             |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index b572e8fc0..e9792841a 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,5 +1,6 @@
 7.9.6
  - fixed #11577: Gallery Album: "Sort by" radio list missing in "Add Archive" view
+ - fixed #11576: Default WebGUI config has a bad macro
 
 7.9.5
  - Asset->www_copy now has a progress bar
diff --git a/docs/upgrades/upgrade_7.9.5-7.9.6.pl b/docs/upgrades/upgrade_7.9.5-7.9.6.pl
index cdd88658c..70ee870d8 100644
--- a/docs/upgrades/upgrade_7.9.5-7.9.6.pl
+++ b/docs/upgrades/upgrade_7.9.5-7.9.6.pl
@@ -31,6 +31,7 @@ my $quiet; # this line required
 my $session = start(); # this line required
 
 # upgrade functions go here
+fixConvertUTCMacroName($session);
 
 finish($session); # this line required
 
@@ -45,6 +46,18 @@ finish($session); # this line required
 #}
 
 
+#----------------------------------------------------------------------------
+# Describe what our function does
+sub fixConvertUTCMacroName {
+    my $session = shift;
+    print "\tFix the name of the ConvertUTCToTZ macro in the config file... " unless $quiet;
+    $session->config->deleteFromHash('macros', 'ConvertToUTC');
+    $session->config->addToHash('macros', 'ConvertUTCToTZ', 'ConvertUTCToTZ');
+    # and here's our code
+    print "DONE!\n" unless $quiet;
+}
+
+
 # -------------- DO NOT EDIT BELOW THIS LINE --------------------------------
 
 #----------------------------------------------------------------------------
diff --git a/etc/WebGUI.conf.original b/etc/WebGUI.conf.original
index a1a4f22b2..620445134 100644
--- a/etc/WebGUI.conf.original
+++ b/etc/WebGUI.conf.original
@@ -790,7 +790,7 @@
     "BackToSite"       : "BackToSite",
     "CanEditText"      : "CanEditText", 
     "CartItemCount"    : "CartItemCount",
-    "ConvertToUTC"     : "ConvertToUTC",
+    "ConvertUTCToTZ"   : "ConvertUTCToTZ",
     "c"                : "c_companyName", 
     "D"                : "D_date", 
     "DeactivateAccount": "DeactivateAccount",