[freeside-commits] freeside/FS/FS CGI.pm,1.34,1.35

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv16201

Modified Files:
	CGI.pm 
Log Message:
fix svc_url to work no matter where we are coming from in the tree -  use rooturl() instead of popurl()

Index: CGI.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/CGI.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- CGI.pm	17 Jan 2007 23:27:18 -0000	1.34
+++ CGI.pm	21 Jan 2007 09:10:46 -0000	1.35
@@ -239,14 +239,17 @@
   #even though this is kludgy
   $url_string =~
     s{
-       (browse|config|docs|edit|graph|misc|search|view|pref)
+       /
+       (browse|config|docs|edit|graph|misc|search|view|pref|rt)
        /
        (process/)?
-       ([\w\-\.]+)
+       ([\w\-\.\/]+)
        $
      }
      {}x;
 
+  $url_string .= '/' unless $url_string =~ /\/$/;
+
   $url_string;
 
 }