X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2FCGI.pm;h=945478475ccde5d194c3de4d0ef526a2cacb7a1c;hb=343befcb41d5ab76173645ceb8ac235ca7b92d35;hp=7ad1dc28f71bba658be7398bf90882e8adc24d85;hpb=9a90f2af0663c9b4e9611e044fd25349425d1aec;p=freeside.git

diff --git a/FS/FS/CGI.pm b/FS/FS/CGI.pm
index 7ad1dc28f..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
@@ -241,7 +247,7 @@ sub rooturl {
        (browse|config|docs|edit|graph|misc|search|view|pref|rt|elements)
        /
        (process/)?
-       ([\w\-\.\/]+)
+       ([\w\-\.\/]*)
        $
      }
      {}x;