From 4980b700da490a0161ba3e0ad2fe72b5d6462462 Mon Sep 17 00:00:00 2001 From: Thomas Gelf Date: Sun, 22 Jun 2014 12:07:50 +0200 Subject: [PATCH] ActionController: __construct() as first function --- .../Web/Controller/ActionController.php | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php index 9d1017c80..0107893ec 100644 --- a/library/Icinga/Web/Controller/ActionController.php +++ b/library/Icinga/Web/Controller/ActionController.php @@ -88,30 +88,6 @@ class ActionController extends Zend_Controller_Action private $auth; - public function Config($file = null) - { - if ($file === null) { - if ($this->config === null) { - $this->config = Config::app(); - } - return $this->config; - } else { - if (! array_key_exists($file, $this->configs)) { - $this->configs[$file] = Config::module($module, $file); - } - return $this->configs[$file]; - } - return $this->config; - } - - public function Auth() - { - if ($this->auth === null) { - $this->auth = AuthManager::getInstance(); - } - return $this->auth; - } - /** * The constructor starts benchmarking, loads the configuration and sets * other useful controller properties @@ -158,6 +134,30 @@ class ActionController extends Zend_Controller_Action } } + public function Config($file = null) + { + if ($file === null) { + if ($this->config === null) { + $this->config = Config::app(); + } + return $this->config; + } else { + if (! array_key_exists($file, $this->configs)) { + $this->configs[$file] = Config::module($module, $file); + } + return $this->configs[$file]; + } + return $this->config; + } + + public function Auth() + { + if ($this->auth === null) { + $this->auth = AuthManager::getInstance(); + } + return $this->auth; + } + protected function moduleInit() { }