From: Jan Schneider <jan@horde.org>
Date: Wed, 24 Mar 2010 18:09:39 +0000 (+0100)
Subject: Fix detection of logging place if called through Horde_Log_Logger#__call().
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=b24b186ef95eec69c770bf491edef85fcb12c5f0;p=horde.git

Fix detection of logging place if called through Horde_Log_Logger#__call().
---

diff --git a/framework/Core/lib/Horde/Core/Log/Logger.php b/framework/Core/lib/Horde/Core/Log/Logger.php
index 8aab63eb9..e7fc57cc7 100644
--- a/framework/Core/lib/Horde/Core/Log/Logger.php
+++ b/framework/Core/lib/Horde/Core/Log/Logger.php
@@ -72,7 +72,16 @@ class Horde_Core_Log_Logger extends Horde_Log_Logger
             }
 
             $trace = debug_backtrace();
-            $trace = $trace[isset($options['trace']) ? ($options['trace'] - 1) : 0];
+            if (isset($options['trace'])) {
+                $frame = $options['trace'] - 1;
+            } elseif (count($trace) > 1 &&
+                      $trace[1]['class'] == 'Horde_Log_Logger' &&
+                      $trace[1]['function'] == '__call') {
+                $frame = 2;
+            } else {
+                $frame = 0;
+            }
+            $trace = $trace[$frame];
         }
 
         $file = isset($options['file'])