From 36b23802990dc9220661ce118788893fce71f71d Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Tue, 18 Nov 2014 21:01:38 -0800 Subject: [PATCH] fix per-agent portal branding on logout, RT#32139 --- FS/FS/ClientAPI/MyAccount.pm | 5 +++-- fs_selfservice/FS-SelfService/cgi/logout.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/FS/FS/ClientAPI/MyAccount.pm b/FS/FS/ClientAPI/MyAccount.pm index 61082bd9e..e02378d41 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 834ef13f2..540b6c900 100644 --- a/fs_selfservice/FS-SelfService/cgi/logout.html +++ b/fs_selfservice/FS-SelfService/cgi/logout.html @@ -1,6 +1,6 @@ - + "> MyAccount <%= $head %> -- 2.11.0