From 08095ad5e8a1bbdea43b90c8d9eb986d9e2432e1 Mon Sep 17 00:00:00 2001
From: Johannes Meyer <johannes.meyer@icinga.com>
Date: Thu, 29 Jun 2017 09:51:24 +0200
Subject: [PATCH] ErrorController: Set $this->rerenderLayout in init()

Solves the issue that when being redirected directly after login
or any other route which causes the layout being rerendered, we
are only presented with the inline layout of the error controller.
---
 application/controllers/ErrorController.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index b0010385d..2f6a22bd9 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -24,6 +24,14 @@ class ErrorController extends ActionController
      */
     protected $requiresAuthentication = false;
 
+    /**
+     * {@inheritdoc}
+     */
+    public function init()
+    {
+        $this->rerenderLayout = $this->params->has('renderLayout');
+    }
+
     /**
      * Display exception
      */