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

Merge pull request #7649 from kinglozzer/logout-backurl

Browse Source 
FIX: Restore BackURL preservation on log out (closes #7636)
This commit is contained in:
Damian Mooyman 2017-11-29 11:31:57 +13:00 committed by GitHub
commit c23d1f3f99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/Security/MemberAuthenticator/LogoutHandler.php
View File

@ -2,6 +2,7 @@
namespace SilverStripe\Security\MemberAuthenticator; namespace SilverStripe\Security\MemberAuthenticator;
use SilverStripe\Control\Controller;
use SilverStripe\Control\Director; use SilverStripe\Control\Director;
use SilverStripe\Control\HTTPResponse; use SilverStripe\Control\HTTPResponse;
use SilverStripe\Control\RequestHandler; use SilverStripe\Control\RequestHandler;
@ -109,6 +110,14 @@ class LogoutHandler extends RequestHandler
return $this->redirect($backURL); return $this->redirect($backURL);
} }
return $this->redirect(Security::config()->get('login_url')); $link = Security::config()->get('login_url');
$referer = $this->getReturnReferer();
if ($referer) {
$link = Controller::join_links($link, '?' . http_build_query([
'BackURL' => Director::makeRelative($referer)
]));
}
return $this->redirect($link);
} }
} }