[freeside-commits] branch FREESIDE_3_BRANCH updated. 826a9f88f7cab5e7af2db6f8a6ec48395e69aea8

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  826a9f88f7cab5e7af2db6f8a6ec48395e69aea8 (commit)
      from  f25c596ba479c7c5cebcfd4447bb0db9c70a1e06 (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 826a9f88f7cab5e7af2db6f8a6ec48395e69aea8
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Dec 30 19:17:50 2014 -0800

    fix contact self-service password reset link vs. outlook, RT#32657

diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index c232c45..9443a7d 100755
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 use strict;
-use vars qw($DEBUG $cgi $session_id $form_max $template_dir);
+use vars qw($DEBUG $cgi $session_id $pw_session_id $form_max $template_dir);
 use subs qw(do_template);
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
@@ -97,7 +97,7 @@ my $action = 'myaccount'; # sensible default
 
 if ( $cgi->param('action') =~ /^process_forgot_password_session_(\w+)$/ ) {
   $action = 'process_forgot_password_session';
-  $session_id = $1;
+  $pw_session_id = $1;
 } elsif ( $cgi->param('action') =~ /^(\w+)$/ ) {
   if (grep {$_ eq $1} @actions) {
     $action = $1;
@@ -1059,7 +1059,7 @@ sub process_forgot_password {
 sub process_forgot_password_session {
   $action = 'process_forgot_password';
   check_reset_passwd(
-    'session_id' => $session_id,
+    'session_id' => $pw_session_id,
   );
 }
 

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

Summary of changes:
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)