From cbd55e75dcb66de4de29af56e9ef68ca0ec2faac Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Mon, 5 Jul 2021 16:00:08 +0200 Subject: [PATCH] Remove cleanup of `userID` and `password` cookies They are no longer used as of WoltLab Suite 5.4, however the removal remained in the code to clean up the browser's cookie store on logout. Remove it, the cookies will naturally expire in the future. --- wcfsetup/install/files/lib/action/LogoutAction.class.php | 8 -------- wcfsetup/install/files/lib/system/WCF.class.php | 8 -------- 2 files changed, 16 deletions(-) diff --git a/wcfsetup/install/files/lib/action/LogoutAction.class.php b/wcfsetup/install/files/lib/action/LogoutAction.class.php index 77d566ec73..690dc9f876 100644 --- a/wcfsetup/install/files/lib/action/LogoutAction.class.php +++ b/wcfsetup/install/files/lib/action/LogoutAction.class.php @@ -27,14 +27,6 @@ class LogoutAction extends \wcf\acp\action\LogoutAction WCF::getSession()->delete(); - // remove cookies - if (isset($_COOKIE[COOKIE_PREFIX . 'userID'])) { - HeaderUtil::setCookie('userID', 0); - } - if (isset($_COOKIE[COOKIE_PREFIX . 'password'])) { - HeaderUtil::setCookie('password', ''); - } - $this->executed(); // forward to index page diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php index 209b129543..de18f14cd1 100644 --- a/wcfsetup/install/files/lib/system/WCF.class.php +++ b/wcfsetup/install/files/lib/system/WCF.class.php @@ -554,14 +554,6 @@ class WCF } else { self::$forceLogout = true; - // remove cookies - if (isset($_COOKIE[COOKIE_PREFIX . 'userID'])) { - HeaderUtil::setCookie('userID', 0); - } - if (isset($_COOKIE[COOKIE_PREFIX . 'password'])) { - HeaderUtil::setCookie('password', ''); - } - throw new NamedUserException(self::getLanguage()->getDynamicVariable('wcf.user.error.isBanned')); } } -- 2.20.1