[freeside-commits] branch FREESIDE_3_BRANCH updated. eaa349aa44febf4271b0b16dcffb894f360df834

Tue Nov 18 21:01:40 PST 2014

The branch, FREESIDE_3_BRANCH has been updated
       via  eaa349aa44febf4271b0b16dcffb894f360df834 (commit)
      from  7df65c63a5c9ad6b79c60841d0e1eb2a7df520e2 (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 eaa349aa44febf4271b0b16dcffb894f360df834
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Nov 18 21:01:39 2014 -0800

    fix per-agent portal branding on logout, RT#32139

diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm
index af747eb..7ae7cc3 100644
--- a/FS/FS/ClientAPI/MyAccount.pm
+++ b/FS/FS/ClientAPI/MyAccount.pm
@@ -308,11 +308,12 @@ sub login {
 
 sub logout {
   my $p = shift;
+  my $skin_info = skin_info($p);
   if ( $p->{'session_id'} ) {
     _cache->remove($p->{'session_id'});
-    return { %{ skin_info($p) }, 'error' => '' };
+    return { %$skin_info, 'error' => '' };
   } else {
-    return { %{ skin_info($p) }, 'error' => "Can't resume session" }; #better error message
+    return { %$skin_info, 'error' => "Can't resume session" }; #better error message
   }
 }
 
diff --git a/fs_selfservice/FS-SelfService/cgi/logout.html b/fs_selfservice/FS-SelfService/cgi/logout.html
index 834ef13..540b6c9 100644
--- a/fs_selfservice/FS-SelfService/cgi/logout.html
+++ b/fs_selfservice/FS-SelfService/cgi/logout.html
@@ -1,6 +1,6 @@
 <HTML>
   <HEAD>
-    <META HTTP-EQUIV="refresh" CONTENT="5;URL=<%= $cgi->url(-absolute => 1) %>">
+    <META HTTP-EQUIV="refresh" CONTENT="5;URL=<%= $cgi->url(-absolute => 1). "?agentnum=$agentnum" %>">
     <TITLE>MyAccount</TITLE>
     <%= $head %>
   </HEAD>

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

Summary of changes:
 FS/FS/ClientAPI/MyAccount.pm                  |    5 +++--
 fs_selfservice/FS-SelfService/cgi/logout.html |    2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)


