[freeside-commits] freeside/FS/FS/UI Web.pm,1.21,1.22

[Ivan,,,]

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

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

Index: Web.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/UI/Web.pm,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- Web.pm	2 Jan 2007 21:46:33 -0000	1.21
+++ Web.pm	21 Jan 2007 09:10:46 -0000	1.22
@@ -91,7 +91,7 @@
   # ##
   #  'ahref'    => 1, # if set true, returns <A HREF="$url">
 
-use FS::CGI qw(popurl);
+use FS::CGI qw(rooturl);
 sub svc_url {
   my %opt = @_;
 
@@ -112,8 +112,7 @@
     $url .= 'svcnum=' if $query =~ /^\d+(;|$)/ or $query eq '';
   }
 
-  my $p = popurl(2); #?
-  my $return = "$p$opt{action}/$url$query";
+  my $return = rooturl(). "$opt{action}/$url$query";
 
   $return = qq!<A HREF="$return">! if $opt{ahref};