From 75980849adf24856c0cca39fdad5b145b15da30d Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Sat, 11 Jul 2009 22:17:08 -0400 Subject: [PATCH] revert - we want exceptions to go beyond this point (though at some point we might want to catch a specific config exception and re-throw a registry exception) --- framework/Core/lib/Horde/Registry.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php index 42dc33f3a..29695cdf8 100644 --- a/framework/Core/lib/Horde/Registry.php +++ b/framework/Core/lib/Horde/Registry.php @@ -899,12 +899,7 @@ class Horde_Registry public function importConfig($app) { if (($app != 'horde') && !$this->_loadCacheVar('conf-' . $app)) { - try { - $appConfig = Horde::loadConfiguration('conf.php', 'conf', $app); - } catch (Horde_Exception $e) { - $appConfig = array(); - } - + $appConfig = Horde::loadConfiguration('conf.php', 'conf', $app); $this->_cache['conf-' . $app] = Horde_Array::array_merge_recursive_overwrite($this->_cache['conf-horde'], $appConfig); $this->_saveCacheVar('conf-' . $app); } -- 2.11.0