From 7edf772eb5a8a719feaefefd9cd499d7b72fceda Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Tue, 14 Jul 2009 16:35:55 -0400
Subject: [PATCH] if appConfig ends up empty, make sure it's an empty array
 before doing array things with it

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

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 275b60884..eb227c6aa 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -896,6 +896,9 @@ class Horde_Registry
     {
         if (($app != 'horde') && !$this->_loadCacheVar('conf-' . $app)) {
             $appConfig = Horde::loadConfiguration('conf.php', 'conf', $app);
+            if (empty($appConfig)) {
+                $appConfig = array();
+            }
             $this->_cache['conf-' . $app] = Horde_Array::array_merge_recursive_overwrite($this->_cache['conf-horde'], $appConfig);
             $this->_saveCacheVar('conf-' . $app);
         }
-- 
2.11.0