From 15a2f91e31e5a1e19e8204d73746684566990d44 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Fri, 13 Jan 2006 02:33:03 +0000
Subject: [PATCH] Change the backtrace workings

---
 kernel.php | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/kernel.php b/kernel.php
index e8834dc..88a133e 100644
--- a/kernel.php
+++ b/kernel.php
@@ -673,12 +673,27 @@ class Shared_Object_Framework
 		}
 		
 		$backtrace = debug_backtrace();
-		unset($backtrace[0]);
+		array_shift($backtrace);
 		
+		if (isset($backtrace[0]) AND $backtrace[0]['function'] == '_error_handler')
+		{
+			array_shift($backtrace);
+		}
+		
+		$trace = array();
+		foreach ($backtrace AS $i => $step)
+		{
+			$file = $step['file'] . ':' . $step['line'];
+			$funct = (isset($step['class']) ? $step['class'] . '::' . $step['function'] : $step['function']);
+			$args = (is_array($step['args']) ? implode(', ', $step['args']) : '');
+	
+			$trace[] = "#$i  $funct($args) called at [$file]"; 
+		}
+	
 		$output = "\n<br />\n<table cellpadding=\"4\" cellspacing=\"1\" border=\"0\" width=\"500\" style=\"background-color: $color; color: black; font-family: Verdana, sans-serif; font-size: 12px;\">";
 		$output .= "\n<tr style=\"color: $font; text-align: left\">\n\t<td><strong>$prefix: $title</strong></td>\n</tr>";
 		$output .= "\n<tr style=\"background-color: #FFFFFF; text-align: left\">\n\t<td>$message</td>\n</tr>";
-		$output .= (($stack AND $GLOBALS['isso:null-framework']->debug) ? "\n<tr style=\"background-color: #FFFFFF; text-align: left\">\n\t<td><strong>Debug Stack:</strong> <pre>" . print_r($backtrace, true) . "</pre></td>\n</tr>" : '');
+		$output .= (($stack AND $GLOBALS['isso:null-framework']->debug) ? "\n<tr style=\"background-color: #FFFFFF; text-align: left\">\n\t<td><strong>Debug Stack:</strong> <pre>" . implode("\n", $trace) . "</pre></td>\n</tr>" : '');
 		$output .= "\n</table>\n<br />\n";
 		
 		if ($return)
-- 
2.43.5