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