From: Chuck Hagenbuch <chuck@horde.org>
Date: Sat, 15 Jan 2011 04:29:49 +0000 (-0500)
Subject: Check for $GLOBALS['conf'] AND $GLOBALS['injector']
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8e17ebfd44c310c8f4f9a0acfe8407ef15fe077c;p=horde.git

Check for $GLOBALS['conf'] AND $GLOBALS['injector']
---

diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index cec702b70..d331226d2 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -88,7 +88,7 @@ class Horde
     {
         /* Chicken/egg: wait until we have basic framework setup before we
          * start logging. */
-        if (isset($GLOBALS['conf'])) {
+        if (isset($GLOBALS['conf']) && isset($GLOBALS['injector'])) {
             $options['trace'] = 2;
             $GLOBALS['injector']->getInstance('Horde_Log_Logger')->log($event, $priority, $options);
         }