Merge branch '6.0' into 6

silverstripe · Feb 22, 2025 · 4670479 · 4670479
2 parents 61d19ee + e796939
commit 4670479
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/RealMeService.php b/src/RealMeService.php
@@ -468,8 +468,9 @@ public function enforceLogin(HTTPRequest $request, $backUrl = null)
 
         // If not, attempt to retrieve authentication data from OneLogin (in case this is called during SAML assertion)
         try {
-            if (!$session->get("RealMeErrorBackURL") && Controller::has_curr()) {
-                $session->set("RealMeErrorBackURL", Controller::curr()->Link("Login"));
+            $controller = Controller::curr();
+            if (!$session->get("RealMeErrorBackURL") && $controller) {
+                $session->set("RealMeErrorBackURL", $controller->Link("Login"));
             }
 
             $auth = $this->getAuth();