From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 5 Jan 2011 08:35:56 +0000 (-0700)
Subject: Don't throw fatal error if unable to load config file
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=25504ac90a01ca372da4f62aeca9daf6c2852578;p=horde.git

Don't throw fatal error if unable to load config file
---

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 6bd18e4e3..3ec128815 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -1369,7 +1369,12 @@ class Horde_Registry
     public function importConfig($app)
     {
         if (!isset($this->_confCache[$app])) {
-            $config = Horde::loadConfiguration('conf.php', 'conf', $app);
+            try {
+                $config = Horde::loadConfiguration('conf.php', 'conf', $app);
+            } catch (Horde_Exception $e) {
+                $config = null;
+            }
+
             $this->_confCache[$app] = empty($config)
                 ? array()
                 : $config;