From 2b5ec255ff78dc3c8ce227ce6c7bd6f105b63270 Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Tue, 2 Nov 2010 13:50:16 -0400 Subject: [PATCH] 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. --- framework/Core/lib/Horde/Registry.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php index 323bc902e..067c8946a 100644 --- a/framework/Core/lib/Horde/Registry.php +++ b/framework/Core/lib/Horde/Registry.php @@ -1294,11 +1294,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]); } /** -- 2.11.0