From c47164601accab061d9c44ca538c46545276c640 Mon Sep 17 00:00:00 2001 From: Eric Lippmann Date: Wed, 11 Mar 2015 22:03:49 +0100 Subject: [PATCH] Don't alias Zend_Controller_Action_HelperBroker in Web.php --- library/Icinga/Application/Web.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/library/Icinga/Application/Web.php b/library/Icinga/Application/Web.php index bd5e09d0f..9d6f226b5 100644 --- a/library/Icinga/Application/Web.php +++ b/library/Icinga/Application/Web.php @@ -18,7 +18,7 @@ use Icinga\Util\Translator; use Zend_Layout; use Zend_Paginator; use Zend_View_Helper_PaginationControl; -use Zend_Controller_Action_HelperBroker as ActionHelperBroker; +use Zend_Controller_Action_HelperBroker; use Zend_Controller_Router_Route; use Zend_Controller_Front; @@ -243,19 +243,14 @@ class Web extends ApplicationBootstrap */ private function setupViewRenderer() { + $view = Zend_Controller_Action_HelperBroker::getStaticHelper('viewRenderer'); /** @var \Zend_Controller_Action_Helper_ViewRenderer $view */ - $view = ActionHelperBroker::getStaticHelper('viewRenderer'); $view->setView(new View()); - $view->view->addHelperPath($this->getApplicationDir('/views/helpers')); - $view->view->setEncoding('UTF-8'); $view->view->headTitle()->prepend($this->config->get('global', 'project', 'Icinga')); - $view->view->headTitle()->setSeparator(' :: '); - $this->viewRenderer = $view; - return $this; }