From 8e17ebfd44c310c8f4f9a0acfe8407ef15fe077c Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Fri, 14 Jan 2011 23:29:49 -0500
Subject: [PATCH] Check for $GLOBALS['conf'] AND $GLOBALS['injector']

---
 framework/Core/lib/Horde.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);
         }
-- 
2.11.0