From 036da072c5f30cc01f2f20c4028a8c6985e64072 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Wed, 19 Aug 2015 12:15:39 +0200 Subject: [PATCH] Revert "ActionController: Give modules a chance to dynamically require auth" This reverts commit 93f8297344cfdb2037f4646dc84046fbea851946. --- library/Icinga/Web/Controller/ActionController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 2787f961e..70fab8b12 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -90,7 +90,6 @@ class ActionController extends Zend_Controller_Action $this->_helper = new ActionHelperBroker($this); $this->handlerBrowserWindows(); - $this->view->tabs = new Tabs(); $this->view->translationDomain = 'icinga'; $this->_helper->layout()->isIframe = $request->getUrl()->shift('isIframe'); $this->_helper->layout()->showFullscreen = $request->getUrl()->shift('showFullscreen'); @@ -107,12 +106,12 @@ class ActionController extends Zend_Controller_Action $this->_helper->layout()->disableLayout(); } - $this->prepareInit(); - if ($this->requiresLogin()) { $this->redirectToLogin(Url::fromRequest()); } + $this->view->tabs = new Tabs(); + $this->prepareInit(); $this->init(); }