[mms] Better error handling when trying to load config files from the…

… conf.d subdirectory. Bug #13333
horde · Jul 9, 2014 · f254da8 · f254da8
1 parent 0387aa4
commit f254da8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/framework/Core/lib/Horde/Registry/Loadconfig.php b/framework/Core/lib/Horde/Registry/Loadconfig.php
@@ -62,8 +62,8 @@ public function __construct($app, $conf_file, $vars = null)
 
         /* Load global configuration stanzas in '.d' directory. */
         $dir = $conf_dir . $pinfo['filename'] . '.d';
-        if (is_dir($dir)) {
-            $flist = array_merge($flist, glob($dir . '/*.php'));
+        if (is_dir($dir) && (($conf_d = glob($dir . '/*.php')) !== false)) {
+            $flist = array_merge($flist, $conf_d);
         }
 
         /* Load local version of configuration file. */

diff --git a/framework/Core/package.xml b/framework/Core/package.xml
@@ -39,7 +39,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
  <notes>
-* 
+* [mms] Better error handling when trying to load config files from the conf.d subdirectory.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -3541,7 +3541,7 @@
    <date>2014-07-08</date>
    <license uri="http://www.horde.org/licenses/lgpl21">LGPL-2.1</license>
    <notes>
-* 
+* [mms] Better error handling when trying to load config files from the conf.d subdirectory.
    </notes>
   </release>
  </changelog>