Fix format_debug_trace() for objects.
authorRobert Sesek <rsesek@bluestatic.org>
Tue, 28 May 2013 01:15:31 +0000 (21:15 -0400)
committerRobert Sesek <rsesek@bluestatic.org>
Tue, 28 May 2013 13:59:26 +0000 (09:59 -0400)
framework/kernel.php

index c797b6c5514b59afbe6f29ade02a276e992e2e8c..c8b90f8fe2fe043ef7153ee3523c4366cc48d95f 100755 (executable)
@@ -669,7 +669,7 @@ class ISSO
                        $args = '';
                        $file = $step['file'] . ':' . $step['line'];
                        $funct = (isset($step['class']) ? $step['class'] . '::' . $step['function'] : $step['function']);
-                       
+
                        if (isset($step['args']) AND is_array($step['args']))
                        {
                                // we need to do this so we don't get "Array to string conversion" notices
@@ -679,13 +679,17 @@ class ISSO
                                        {
                                                $step['args']["$id"] = 'Array';
                                        }
+                                       else if (is_object($arg))
+                                       {
+                                               $step['args']["$id"] = get_class($arg);
+                                       }
                                }
                                $args = implode(', ', $step['args']);
                        }
-       
+
                        $trace[] = "#$i  $funct($args) called at [$file]"; 
                }
-               
+
                return $trace;
        }