From 25504ac90a01ca372da4f62aeca9daf6c2852578 Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 5 Jan 2011 01:35:56 -0700
Subject: [PATCH] Don't throw fatal error if unable to load config file

---
 framework/Core/lib/Horde/Registry.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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;
-- 
2.11.0