From 70effc7046854b751621e12d26b308374eceeecb Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Wed, 4 Apr 2018 13:51:18 +0100 Subject: [PATCH] Revert "ENHANCEMENT Add config var to skip confirm logout (#7977)" This reverts commit 47bcac930df8bde71ffeb9144ac07d429ea9ee87. --- src/Security/MemberAuthenticator/LogoutHandler.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/Security/MemberAuthenticator/LogoutHandler.php b/src/Security/MemberAuthenticator/LogoutHandler.php index 3e129b1b6..9b870a259 100644 --- a/src/Security/MemberAuthenticator/LogoutHandler.php +++ b/src/Security/MemberAuthenticator/LogoutHandler.php @@ -37,11 +37,6 @@ class LogoutHandler extends RequestHandler 'LogoutForm' ]; - /** - * @config - * @var bool - */ - private static $confirm_logout = true; /** * 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. // 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( _t( 'SilverStripe\\Security\\Security.CONFIRMLOGOUT',