From: Michael M Slusarz <slusarz@curecanti.org>
Date: Mon, 15 Nov 2010 21:07:17 +0000 (-0700)
Subject: Browser object needs to be created after config array is loaded - or else the logger... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=f89e332c0329a986eefc31ff6e0b5e4b6ece5e5f;p=horde.git

Browser object needs to be created after config array is loaded - or else the logger will always be null
---

diff --git a/framework/Core/lib/Horde/Core/Browser.php b/framework/Core/lib/Horde/Core/Browser.php
index e933855e0..edb657eeb 100644
--- a/framework/Core/lib/Horde/Core/Browser.php
+++ b/framework/Core/lib/Horde/Core/Browser.php
@@ -78,4 +78,5 @@ class Horde_Core_Browser extends Horde_Browser
             ? $GLOBALS['session']->get('horde', 'ie_version')
             : null;
     }
+
 }
diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 4d9c58e6f..1f172e887 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -318,9 +318,6 @@ class Horde_Registry
             $GLOBALS['__autoloader']->addCallback($key, array($val, 'callback'));
         }
 
-        /* Initialize browser object. */
-        $GLOBALS['browser'] = $injector->getInstance('Horde_Browser');
-
         /* Import and global Horde's configuration values. Almost a chicken
          * and egg issue - since loadConfiguration() uses registry in certain
          * instances. However, if HORDE_BASE is defined, and app is
@@ -329,6 +326,9 @@ class Horde_Registry
         $this->_cache['conf-horde'] = Horde::loadConfiguration('conf.php', 'conf', 'horde');
         $conf = $GLOBALS['conf'] = &$this->_cache['conf-horde'];
 
+        /* Initialize browser object. */
+        $GLOBALS['browser'] = $injector->getInstance('Horde_Browser');
+
         /* Initial Horde-wide settings. */
 
         /* Set the maximum execution time in accordance with the config