From: Chuck Hagenbuch <chuck@horde.org>
Date: Sun, 12 Jul 2009 02:17:08 +0000 (-0400)
Subject: revert - we want exceptions to go beyond this point (though at some point we might... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=75980849adf24856c0cca39fdad5b145b15da30d;p=horde.git

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)
---

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);
         }