[freeside-commits] branch master updated. 7898193bb13ad215d1cc95983dbd092fbd2ba799

[Ivan]

The branch, master has been updated
       via  7898193bb13ad215d1cc95983dbd092fbd2ba799 (commit)
       via  742413b38cee4b7991643368dc9796500857298c (commit)
      from  230e099f92541bc3bc0e2a08e81932ee17909fa0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7898193bb13ad215d1cc95983dbd092fbd2ba799
Merge: 742413b 230e099
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri May 15 11:41:24 2015 -0700

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 742413b38cee4b7991643368dc9796500857298c
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Fri May 15 11:35:17 2015 -0700

    fix login redirect with query portion (i.e. cust_main.cgi?1) and on errors, RT#21563

diff --git a/httemplate/loginout/login.html b/httemplate/loginout/login.html
index 3c6e2ae..8d599ad 100644
--- a/httemplate/loginout/login.html
+++ b/httemplate/loginout/login.html
@@ -13,8 +13,10 @@
 % } 
              
 %#  <FORM METHOD="POST" ACTION="<%$url_string%>loginout/login">
+%  my $uri = $r->prev->uri;
+%  $uri .= '?'. $r->prev->args if length( $r->prev->args );
   <FORM METHOD="POST" ACTION="/login">
-    <INPUT TYPE="hidden" NAME="destination" VALUE="<% $r->prev->unparsed_uri %>">
+    <INPUT TYPE="hidden" NAME="destination" VALUE="<% $uri %>">
 
     <TABLE CELLSPACING=0 CELLPADDING=4 BGCOLOR="#cccccc">
       <TR>
@@ -45,7 +47,7 @@ my %error = (
 );
 
 my $error = # $cgi->param('logout') ||
-            $r->prev->subprocess_env("AuthCookieReason");
+            $r->prev->subprocess_env('AuthCookieReason');
 
 $error = exists($error{$error}) ? $error{$error} : $error;
 

-----------------------------------------------------------------------

Summary of changes:
 httemplate/loginout/login.html |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)