This commit was manufactured by cvs2svn to create tag 'freeside_2_1_0'.

[freeside.git] / FS / FS / CGI.pm

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 9454784..f33a718 100644 (file)
--- 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