[freeside-commits] branch master updated. 36b23802990dc9220661ce118788893fce71f71d

Tue Nov 18 21:01:38 PST 2014

The branch, master has been updated
       via  36b23802990dc9220661ce118788893fce71f71d (commit)
      from  e9b2a0d4a388aeb876560aa243d4b9d90ba8c84b (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 36b23802990dc9220661ce118788893fce71f71d
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Nov 18 21:01:38 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 61082bd..e02378d 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(-)


