merging 5.8.0 and 6.1.1 changes

This commit is contained in:
JT Smith 2004-07-18 17:43:08 +00:00
parent ae87943d1e
commit 797b8581b6
14 changed files with 109 additions and 16296 deletions

View file

@ -12,10 +12,11 @@ package WebGUI::Macro::Slash_gatewayUrl;
use strict;
use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub process {
return ($session{config}{scripturl} || $session{env}{SCRIPT_NAME})."/";
return WebGUI::URL::getSiteURL();
}