Don't throw fatal error if unable to load config file
authorMichael M Slusarz <slusarz@curecanti.org>
Wed, 5 Jan 2011 08:35:56 +0000 (01:35 -0700)
committerMichael M Slusarz <slusarz@curecanti.org>
Wed, 5 Jan 2011 08:54:24 +0000 (01:54 -0700)
framework/Core/lib/Horde/Registry.php

index 6bd18e4..3ec1288 100644 (file)
@@ -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;