From f22195496067ce9bc640408429db8b2b7e65b9cf Mon Sep 17 00:00:00 2001
From: Gunnar Wrobel <p@rdus.de>
Date: Mon, 6 Dec 2010 08:48:39 +0100
Subject: [PATCH] Fix problems with the Horde::errorHandler() call.

I currently get a fatal error whithin dynamic Imp (WSOD). Apparently
Horde::errorHandler() gets called during shutdown. The stack trace I
get from the error that Horde::errorHandler() tries to log looks like
this:

Stack trace:
#0 [internal function]: Horde::errorHandler('<!DOCTYPE html ...', 5)
#1 [internal function]: ob_gzhandler()
#2 {main}

While I still need to identify the source of this error I believe the
logMessage() method should always ensure it can actually log
something.
---
 framework/Core/lib/Horde.php | 3 +++
 1 file changed, 3 insertions(+)
diff --git a/framework/Core/lib/Horde.php b/framework/Core/lib/Horde.php
index feb83851d..0b5da579d 100644
--- a/framework/Core/lib/Horde.php
+++ b/framework/Core/lib/Horde.php
@@ -86,6 +86,9 @@ class Horde
     static public function logMessage($event, $priority = null,
                                       array $options = array())
     {
+        if (!isset($GLOBALS['injector'])) {
+            throw new Horde_Exception('The default environment is missing. Unable to write log entries!');
+        }
         $options['trace'] = 2;
         $GLOBALS['injector']->getInstance('Horde_Log_Logger')->log($event, $priority, $options);
     }
-- 
2.11.0

