From 18f116b9b2bdfd3bd317f72bc452777bb515918b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim=20D=C3=BCsterhus?= Date: Wed, 9 Dec 2020 11:54:23 +0100 Subject: [PATCH] Append 'Authentication' to name of SessionHandler::changeUserAfterMultifactor() --- wcfsetup/install/files/lib/acp/form/LoginForm.class.php | 2 +- wcfsetup/install/files/lib/form/LoginForm.class.php | 2 +- .../install/files/lib/system/session/SessionHandler.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php index 404dbc7bb1..ecf10c9f2c 100755 --- a/wcfsetup/install/files/lib/acp/form/LoginForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/LoginForm.class.php @@ -202,7 +202,7 @@ class LoginForm extends AbstractCaptchaForm { parent::save(); // change user - $needsMultifactor = WCF::getSession()->changeUserAfterMultifactor($this->user); + $needsMultifactor = WCF::getSession()->changeUserAfterMultifactorAuthentication($this->user); $this->saved(); $this->performRedirect($needsMultifactor); diff --git a/wcfsetup/install/files/lib/form/LoginForm.class.php b/wcfsetup/install/files/lib/form/LoginForm.class.php index d2b035d665..aa448aba57 100644 --- a/wcfsetup/install/files/lib/form/LoginForm.class.php +++ b/wcfsetup/install/files/lib/form/LoginForm.class.php @@ -24,7 +24,7 @@ class LoginForm extends \wcf\acp\form\LoginForm { if (FORCE_LOGIN) WCF::getSession()->unregister('__wsc_forceLoginRedirect'); // change user - $needsMultifactor = WCF::getSession()->changeUserAfterMultifactor($this->user); + $needsMultifactor = WCF::getSession()->changeUserAfterMultifactorAuthentication($this->user); $this->saved(); diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php index c468e8e7a3..1efbfdc8fb 100644 --- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php +++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php @@ -709,7 +709,7 @@ final class SessionHandler extends SingletonFactory { * * If `true` is returned you should perform a redirect to `MultifactorAuthenticationForm`. */ - public function changeUserAfterMultifactor(User $user): bool { + public function changeUserAfterMultifactorAuthentication(User $user): bool { if ($user->multifactorActive) { $this->register(self::CHANGE_USER_AFTER_MULTIFACTOR_KEY, [ 'userId' => $user->userID, -- 2.20.1