From b2ebf48300c4f1f6daaaf028a4b755c37b4c8560 Mon Sep 17 00:00:00 2001
From: JT Smith <jt@plainblack.com>
Date: Wed, 5 Jun 2002 05:09:21 +0000
Subject: [PATCH] Fixed a problem where the anti-caching string was added to
 the URL prematurely.

---
 lib/WebGUI/Macro/Backslash_pageUrl.pm | 4 ++--
 lib/WebGUI/Macro/Slash_gatewayUrl.pm  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/WebGUI/Macro/Backslash_pageUrl.pm b/lib/WebGUI/Macro/Backslash_pageUrl.pm
index 54b061f84..d29f1c644 100644
--- a/lib/WebGUI/Macro/Backslash_pageUrl.pm
+++ b/lib/WebGUI/Macro/Backslash_pageUrl.pm
@@ -18,10 +18,10 @@ use WebGUI::URL;
 sub process {
 	my ($output);
 	$output = $_[0];
-        $output =~ s/\^\\\;/WebGUI::URL::page()/ge;
+        $output =~ s/\^\\\;/$session{page}{url}/g;
 	return $output;
 }
 
 
-
 1;
+
diff --git a/lib/WebGUI/Macro/Slash_gatewayUrl.pm b/lib/WebGUI/Macro/Slash_gatewayUrl.pm
index 9b34cc61f..e7d5eb06b 100644
--- a/lib/WebGUI/Macro/Slash_gatewayUrl.pm
+++ b/lib/WebGUI/Macro/Slash_gatewayUrl.pm
@@ -16,9 +16,10 @@ use WebGUI::URL;
 
 #-------------------------------------------------------------------
 sub process {
-	my ($output);
+	my ($output, $temp);
 	$output = $_[0];
-        $output =~ s/\^\/\;/WebGUI::URL::gateway()/ge;
+	$temp = $session{config}{scripturl}.'/';
+        $output =~ s/\^\/\;/$temp/g;
 	return $output;
 }