FIX Don't overwrite JSON errors with templated error page (#1334)

silverstripe · Aug 1, 2022 · 523821b · 523821b
1 parent 8c6bc47
commit 523821b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php
@@ -780,7 +780,10 @@ protected function init()
 
     public function afterHandleRequest()
     {
-        if ($this->response->isError() && !$this->request->isAjax()) {
+        if ($this->response->isError()
+            && !$this->request->isAjax()
+            && $this->response->getHeader('Content-Type') !== 'application/json'
+        ) {
             $this->init();
             $errorCode = $this->response->getStatusCode();
             $errorType = $this->response->getStatusDescription();

diff --git a/tests/behat/features/notfound.feature b/tests/behat/features/notfound.feature
@@ -1,4 +1,3 @@
-@gsat
 Feature: Not found
   As a site owner
   I want error messages to be displayed in the context of the admin section