[freeside-commits] branch FREESIDE_3_BRANCH updated. 98b36380fd09ade523de7046e0c67e3e9b35de03

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  98b36380fd09ade523de7046e0c67e3e9b35de03 (commit)
      from  e70335c54c0e4dd39485f1c711c1a7cc037df695 (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 98b36380fd09ade523de7046e0c67e3e9b35de03
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Jan 5 01:43:50 2014 -0800

    fix login with an existing session cookie, RT#25533

diff --git a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
index 1372311..f84f5d6 100755
--- a/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
+++ b/fs_selfservice/FS-SelfService/cgi/selfservice.cgi
@@ -105,7 +105,7 @@ unless ( $nologin_actions{$action} ) {
 
   my %cookies = CGI::Cookie->fetch;
 
-  my $login_rv;
+  my $login_rv = {};
 
   if ( exists($cookies{'session'}) ) {
 
@@ -178,10 +178,7 @@ unless ( $nologin_actions{$action} ) {
 
     } # else session_id ne 'login'
 
-  } else {
-    # there is no session cookie
-    $login_rv = {};
-  }
+  } # else there is no session cookie
 
   if ( !$session_id ) {
     # XXX why are we getting agentnum from a CGI param? surely it should 

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

Summary of changes:
 fs_selfservice/FS-SelfService/cgi/selfservice.cgi |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)