From c86971c93fb88daf64aacce246906b7db651bf52 Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Tue, 20 Jan 2009 21:30:12 +0000 Subject: [PATCH] #2328 - Show backtrace for uncaught exceptions (ajshort) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@70444 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- dev/Debug.php | 2 +- dev/DebugView.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/Debug.php b/dev/Debug.php index 65a48893d..175dea14c 100644 --- a/dev/Debug.php +++ b/dev/Debug.php @@ -323,7 +323,7 @@ class Debug { $lines = array_slice($lines, $offset, 16, true); $reporter->writeSourceFragment($lines, $errline); - $reporter->writeTrace($lines); + $reporter->writeTrace(($errcontext ? $errcontext : debug_backtrace())); $reporter->writeFooter(); exit(1); } diff --git a/dev/DebugView.php b/dev/DebugView.php index ad7cd5524..f225340b8 100644 --- a/dev/DebugView.php +++ b/dev/DebugView.php @@ -146,9 +146,9 @@ class DebugView { /** * Write a backtrace */ - function writeTrace() { + function writeTrace($trace) { echo '

Trace

'; - Debug::backtrace(); + echo Debug::get_rendered_backtrace($trace); echo ''; }