From 294d8f87bf6beb2da380d1418efa803949db4376 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Thu, 6 Mar 2014 11:13:07 +0000 Subject: [PATCH] Move moduleContainer to a separate function as it will be removed --- library/Icinga/Web/Controller/ActionController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 4187239df..bf3b8df72 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -281,6 +281,8 @@ class ActionController extends Zend_Controller_Action { Benchmark::measure('Action::postDispatch()'); + $this->addModuleContainer(); + if ($this->_request->isXmlHttpRequest() || $this->getParam('view') === 'compact') { $this->_helper->layout()->setLayout('inline'); } @@ -311,7 +313,11 @@ class ActionController extends Zend_Controller_Action $this->sendAsPdfAndDie(); } - // Module container + + } + + protected function addModuleContainer() + { $module_name = $this->_request->getModuleName(); $this->_helper->layout()->moduleStart = '