Merge pull request #448 from lunika/master

fix #446 issue, search good call to log method in ConnectionWrapper
propelorm · Sep 30, 2013 · fb9a109 · fb9a109
2 parents c2f86f5 + c887ab1
commit fb9a109
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/Propel/Runtime/Connection/ConnectionWrapper.php b/src/Propel/Runtime/Connection/ConnectionWrapper.php
@@ -638,7 +638,14 @@ public function log($msg)
         if (!isset($backtrace[1]['function'])) {
             return;
         }
-        $callingMethod = $backtrace[1]['function'];
+
+        $i = 1;
+        $stackSize = count($backtrace);
+        do {
+            $callingMethod = $backtrace[$i]['function'];
+            $i++;
+        } while($callingMethod == "log" && $i < $stackSize);
+
         if (!$msg || !$this->isLogEnabledForMethod($callingMethod)) {
             return;
         }