tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2162 from simonwelsh/sec-redirect

Browse Source 
Only redirect on logout if we're not already redirecting
This commit is contained in:
Andrew Short 2013-06-26 15:56:56 -07:00
commit 973a23fac8
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/Security.php
View File

@ -346,7 +346,9 @@ class Security extends Controller {
$member = Member::currentUser(); $member = Member::currentUser();
if($member) $member->logOut(); if($member) $member->logOut();
if($redirect) $this->redirectBack(); if($redirect && (!$this->response || !$this->response->isFinished())) {
$this->redirectBack();
}
} }