From: Chuck Hagenbuch <chuck@horde.org>
Date: Tue, 2 Nov 2010 17:50:16 +0000 (-0400)
Subject: Don't cache combined config arrays.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=408510415b8856dca4cb0c3aa7b4ee9b5ef9d0a0;p=horde.git

Don't cache combined config arrays.

This was leading to stale Horde config data being in an app's cached config,
causing incorrect URLs to be generated. If this isn't the correct solution, then
I think application config cache keys need to take an md5sum of the Horde config
into account so they are thrown out when they don't match.
---

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 7e59ede35..070754394 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -1306,11 +1306,11 @@ class Horde_Registry
             if (empty($appConfig)) {
                 $appConfig = array();
             }
-            $this->_cache['conf-' . $app] = Horde_Array::array_merge_recursive_overwrite($this->_cache['conf-horde'], $appConfig);
+            $this->_cache['conf-' . $app] = $appConfig;
             $this->_saveCacheVar('conf-' . $app);
         }
-
-        $GLOBALS['conf'] = &$this->_cache['conf-' . $app];
+        
+        $GLOBALS['conf'] = Horde_Array::array_merge_recursive_overwrite($this->_cache['conf-horde'], $this->_cache['conf-' . $app]);
     }
 
     /**