X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=945478475ccde5d194c3de4d0ef526a2cacb7a1c;hb=b49c1bd5510a5f10b05bffacc6cc8b6a1b2153e8;hp=f33a718fa68711b8dda79cd4a1f70c1716776d33;hpb=40a7b3dc653e099f7bd0bd762b649b04c4432db2;p=freeside.git diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm index f33a718fa..945478475 100644 --- a/FS/FS/CGI.pm +++ b/FS/FS/CGI.pm @@ -227,9 +227,15 @@ sub popurl { =cut sub rooturl { - # better to start with the client-provided URL - my $cgi = &FS::UID::cgi; - my $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url; + my $url_string; + if ( scalar(@_) ) { + $url_string = shift; + } else { + # better to start with the client-provided URL + my $cgi = &FS::UID::cgi; + $url_string = $cgi->isa('Apache') ? $cgi->uri : $cgi->url; + } + $url_string =~ s/\?.*//; #even though this is kludgy