Merge branch '6.0' into 6

silverstripe · Feb 24, 2025 · c6950a0 · c6950a0
2 parents ba8f1d4 + 8d13bdc
commit c6950a0
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/src/Authenticator/LoginHandler.php b/src/Authenticator/LoginHandler.php
@@ -579,10 +579,7 @@ protected function doPerformLogin(HTTPRequest $request, Member $member)
     {
         // Deactivate sudo mode that was activated in doLogin()
         $service = $this->getSudoModeService();
-        // Check if the service has a deactivate method, because it is not defined on the interface
-        if (ClassInfo::hasMethod($service, 'deactivate')) {
-            call_user_func([$service, 'deactivate'], $this->getRequest()->getSession());
-        }
+        $service->deactivate($request->getSession());
 
         // Load the previously stored data from session and perform the login using it...
         $data = $request->getSession()->get(static::SESSION_KEY . '.additionalData') ?: [];