From: Ben Klang <ben@alkaloid.net>
Date: Tue, 18 May 2010 19:08:07 +0000 (-0400)
Subject: Framework: fix loading vhost config files
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f6e4efac07b1f44be03f227b1ac65abc3973c467;p=horde.git

Framework: fix loading vhost config files
---

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 6177ff322..7014dca92 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -316,6 +316,16 @@ class Horde_Registry
             umask($conf['umask']);
         }
 
+        $vhost = null;
+        if (!empty($conf['vhosts'])) {
+            $vhost = HORDE_BASE . '/config/registry-' . $conf['server']['name'] . '.php';
+            if (file_exists($vhost)) {
+                $this->_regmtime = max($this->_regmtime, filemtime($vhost));
+            } else {
+                $vhost = null;
+            }
+        }
+
         /* Always need to load applications information. */
         $this->_loadApplicationsCache($vhost);
 
@@ -347,16 +357,6 @@ class Horde_Registry
         $this->_regmtime = max(filemtime(HORDE_BASE . '/config/registry.php'),
                                filemtime(HORDE_BASE . '/config/registry.d'));
 
-        $vhost = null;
-        if (!empty($conf['vhosts'])) {
-            $vhost = HORDE_BASE . '/config/registry-' . $conf['server']['name'] . '.php';
-            if (file_exists($vhost)) {
-                $this->_regmtime = max($this->_regmtime, filemtime($vhost));
-            } else {
-                $vhost = null;
-            }
-        }
-
         /* Stop system if Horde is inactive. */
         if ($this->applications['horde']['status'] == 'inactive') {
             throw new Horde_Exception(_("This system is currently deactivated."));