Merge pull request #1466 from kinglozzer/1443-error-context

Suppress admin error context for base 'CMS access' permission check (fixes #1443)
silverstripe · Mar 7, 2023 · 42c0ce4 · 42c0ce4
2 parents 99082e8 + 9b9162b
commit 42c0ce4
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
@@ -181,6 +181,11 @@ class LeftAndMain extends Controller implements PermissionProvider
      */
     private string $httpErrorMessage;
 
+    /**
+     * Used to allow errors to be displayed using a front-end template
+     */
+    private bool $suppressAdminErrorContext = false;
+
     /**
      * Assign themes to use for cms
      *
@@ -660,6 +665,7 @@ protected function init()
                 ),
             ];
 
+            $this->suppressAdminErrorContext = true;
             Security::permissionFailure($this, $messageSet);
             return;
         }
@@ -781,7 +787,8 @@ protected function init()
 
     public function afterHandleRequest()
     {
-        if ($this->response->isError()
+        if (!$this->suppressAdminErrorContext
+            && $this->response->isError()
             && !$this->request->isAjax()
             && $this->response->getHeader('Content-Type') !== 'application/json'
         ) {