tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not save config references in the `ActionController' 

This is redundant because our `Config' class already caches loaded configs.
This commit is contained in:
Eric Lippmann 2014-09-19 14:44:21 +02:00
parent 119e23e79e
commit 264d818133
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Icinga/Web/Controller/ActionController.php
View File

@ -39,10 +39,6 @@ class ActionController extends Zend_Controller_Action
*/
protected $requiresAuthentication = true;
private $config;
private $configs = array();
private $autorefreshInterval;
private $reloadCss = false;
@ -110,17 +106,10 @@ 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;
return Config::app();
} else {
if (! array_key_exists($file, $this->configs)) {
$this->configs[$file] = Config::module($module, $file);
}
return $this->configs[$file];
return Config::app($file);
}
return $this->config;
}
public function Auth()