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 #7980 from silverstripe/revert-confirm_logout_config_var

Browse Source 
Revert "ENHANCEMENT Add config var to skip confirm logout (#7977)"
This commit is contained in:
Damian Mooyman 2018-04-05 08:02:22 +12:00 committed by GitHub
commit f29ceec70d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,11 +37,6 @@ class LogoutHandler extends RequestHandler
'LogoutForm' 'LogoutForm'
]; ];
/**
* @config
* @var bool
*/
private static $confirm_logout = true;
/** /**
* Log out form handler method * Log out form handler method
@ -59,7 +54,7 @@ class LogoutHandler extends RequestHandler
// If the user doesn't have a security token, show them a form where they can get one. // If the user doesn't have a security token, show them a form where they can get one.
// This protects against nuisance CSRF attacks to log out users. // This protects against nuisance CSRF attacks to log out users.
if ($member && self::config()->get('confirm_logout') && !SecurityToken::inst()->checkRequest($this->getRequest())) { if ($member && !SecurityToken::inst()->checkRequest($this->getRequest())) {
Security::singleton()->setSessionMessage( Security::singleton()->setSessionMessage(
_t( _t(
'SilverStripe\\Security\\Security.CONFIRMLOGOUT', 'SilverStripe\\Security\\Security.CONFIRMLOGOUT',