From 264d8181337d6d0bf58b45a05ed49578731975e0 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Fri, 19 Sep 2014 14:44:21 +0200
Subject: [PATCH] Do not save config references in the `ActionController'

This is redundant because our `Config' class already caches loaded configs.
---
 .../Icinga/Web/Controller/ActionController.php    | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/library/Icinga/Web/Controller/ActionController.php b/library/Icinga/Web/Controller/ActionController.php
index fb3345077..d3fc54535 100644
--- a/library/Icinga/Web/Controller/ActionController.php
+++ b/library/Icinga/Web/Controller/ActionController.php
@@ -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()