Merge branch '3.0' into 3

silverstripe · Feb 23, 2025 · 251a688 · 251a688
2 parents d0fc197 + f336832
commit 251a688
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/ErrorPageControllerExtension.php b/src/ErrorPageControllerExtension.php
@@ -38,7 +38,6 @@ protected function onBeforeHTTPError($statusCode, $request, $errorMessage = null
 
     private function isAdminController(): bool
     {
-        return ($this->owner instanceof LeftAndMain)
-            || Controller::has_curr() && (Controller::curr() instanceof LeftAndMain);
+        return ($this->owner instanceof LeftAndMain) || (Controller::curr() instanceof LeftAndMain);
     }
 }