Merge pull request #10023 from xini/fix-destroy-session-on-logout

silverstripe · Jul 20, 2021 · 507c70e · 507c70e
2 parents 4cd6b14 + 3e2ca30
commit 507c70e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Forms/HTMLEditor/TinyMCEConfig.php b/src/Forms/HTMLEditor/TinyMCEConfig.php
@@ -593,7 +593,7 @@ public function insertButtonsAfter($after, $buttons)
 
     /**
      * Remove the first occurrence of buttons
-     * @param string|string[] $buttons,... An array of strings, or one or more strings. The button names to remove. 
+     * @param string|string[] $buttons,... An array of strings, or one or more strings. The button names to remove.
      */
     public function removeButtons($buttons)
     {

diff --git a/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php b/src/Security/MemberAuthenticator/SessionAuthenticationHandler.php
@@ -112,6 +112,6 @@ protected static function regenerateSessionId()
     public function logOut(HTTPRequest $request = null)
     {
         $request = $request ?: Controller::curr()->getRequest();
-        $request->getSession()->restart($request);
+        $request->getSession()->destroy();
     }
 }