From: Jan Schneider <jan@horde.org>
Date: Tue, 14 Jul 2009 11:49:46 +0000 (+0200)
Subject: How do we want to deal with optional configuration files?
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=6c1cfaf412b80ecf29fea8c589618480f33dadec;p=horde.git

How do we want to deal with optional configuration files?
We used to ignore PEAR_Errors where config files are optional. This no longer
works with exceptions.
---

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index 58f336949..21cdb795d 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -692,7 +692,8 @@ HTML;
         // Return an error if neither main or vhosted versions of the config
         // file exist.
         if (!$was_included) {
-            throw new Horde_Exception(sprintf('Failed to import configuration file "%s".', $config_dir . $config_file));
+            Horde::logMessage(sprintf('Failed to import configuration file "%s".', $config_dir . $config_file), __FILE__, __LINE__, PEAR_LOG_DEBUG);
+            return;
         }
 
         if (isset($output) && $show_output) {