Merge remote-tracking branch 'upstream/master'

[freeside.git] / httemplate / loginout / login.html

diff --git a/httemplate/loginout/login.html b/httemplate/loginout/login.html
index a67ea4b..3c6e2ae 100644 (file)
--- a/httemplate/loginout/login.html
+++ b/httemplate/loginout/login.html
@@ -14,7 +14,7 @@
              
 %#  <FORM METHOD="POST" ACTION="<%$url_string%>loginout/login">
   <FORM METHOD="POST" ACTION="/login">
-    <INPUT TYPE="hidden" NAME="destination" VALUE="<% $r->prev->uri %>">
+    <INPUT TYPE="hidden" NAME="destination" VALUE="<% $r->prev->unparsed_uri %>">
 
     <TABLE CELLSPACING=0 CELLPADDING=4 BGCOLOR="#cccccc">
       <TR>
@@ -50,8 +50,7 @@ my $error = # $cgi->param('logout') ||
 $error = exists($error{$error}) ? $error{$error} : $error;
 
 
-#my $url_string = CGI->new->url;
-my $url_string = $cgi->url;
+my $url_string = $r->uri;
 
 #fake a freeside path for /login so we get our .css.  shrug
 $url_string =~ s/login$/freeside\/login/ unless $url_string =~ /freeside\//;