Merge pull request #588 from creative-commoners/pulls/6.0/ctrl-curr

ENH Stop using Controller::has_curr()
silverstripe · Feb 16, 2025 · 881bccd · 881bccd
2 parents c8dc424 + a29555d
commit 881bccd
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Extension/MemberExtension.php b/src/Extension/MemberExtension.php
@@ -174,11 +174,11 @@ public function providePermissions(): array
      */
     protected function onAfterMemberLoggedIn(): void
     {
-        if (!Controller::has_curr()) {
+        $controller = Controller::curr();
+        if (!$controller) {
             return;
         }
-
-        Controller::curr()
+        $controller
             ->getRequest()
             ->getSession()
             ->clear(ChangePasswordHandler::MFA_VERIFIED_ON_CHANGE_PASSWORD);