Set template fallback

Important if a template name specified exists in Layout folder only
jonom · Jul 12, 2018 · 9115403 · 9115403
1 parent 451cba9
commit 9115403
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/CustomErrorControllerExtension.php b/src/CustomErrorControllerExtension.php
@@ -75,7 +75,11 @@ public function customError($errorCode, $customFields, $template = null, $contro
 
         // Otherwise build a themed response
         if (!$controllerType) $controllerType = $this->config()->get('default_controller');
-        if (!$template) $template = $this->config()->get('default_template');
+        $templates = [];
+        if ($template) $templates[] = $template;
+        // Fallback to default template
+        $templates[] = $this->config()->get('default_template');
+        $templates[] = 'Page';
         $defaultCustomFields = $this->defaultCustomFieldsFor($errorCode);
         $response = new HTTPResponse();
         $response->setStatusCode($errorCode);
@@ -102,7 +106,7 @@ public function customError($errorCode, $customFields, $template = null, $contro
         $controller->setResponse(new HTTPResponse());
         $controller->doInit();
         $controller->pushCurrent();
-        $body = $controller->renderWith($template, $customFields);
+        $body = $controller->renderWith($templates, $customFields);
         $controller->popCurrent();
         $response->setBody($body);
         if ($response) {