tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Added Debug::get_rendered_backtrace() for rendering backtraces from other contexts (such as exceptions)

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@60601 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-08-13 03:40:06 +00:00
parent 12868bab9f
commit 1a73ef447e
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dev/Debug.php
View File

@ -479,7 +479,20 @@ class Debug {
*/ */
static function backtrace($returnVal = false, $ignoreAjax = false) { static function backtrace($returnVal = false, $ignoreAjax = false) {
$bt = debug_backtrace(); $bt = debug_backtrace();
$result = self::get_rendered_backtrace($bt, Director::is_cli() || (Director::is_ajax() && !$ignoreAjax));
if ($returnVal) {
return $result;
} else {
echo $result;
}
}
/**
* Render a backtrace array into an appropriate plain-text or HTML string.
* @param $bt The trace array, as returned by debug_backtrace() or Exception::getTrace().
* @param $plainText Set to false for HTML output, or true for plain-text output
*/
static function get_rendered_backtrace($bt, $plainText = false) {
// Ingore functions that are plumbing of the error handler // Ingore functions that are plumbing of the error handler
$ignoredFunctions = array('DebugView->writeTrace', 'CliDebugView->writeTrace', 'Debug::emailError','Debug::warningHandler','Debug::fatalHandler','errorHandler','Debug::showError','Debug::backtrace', 'exceptionHandler'); $ignoredFunctions = array('DebugView->writeTrace', 'CliDebugView->writeTrace', 'Debug::emailError','Debug::warningHandler','Debug::fatalHandler','errorHandler','Debug::showError','Debug::backtrace', 'exceptionHandler');
while( $bt && in_array(self::full_func_name($bt[0]), $ignoredFunctions) ) { while( $bt && in_array(self::full_func_name($bt[0]), $ignoredFunctions) ) {
@ -488,7 +501,7 @@ class Debug {
$result = "<ul>"; $result = "<ul>";
foreach($bt as $item) { foreach($bt as $item) {
if(Director::is_cli() || (Director::is_ajax() && !$ignoreAjax)) { if($plainText) {
$result .= self::full_func_name($item,true) . "\n"; $result .= self::full_func_name($item,true) . "\n";
if(isset($item['line']) && isset($item['file'])) $result .= "line $item[line] of " . basename($item['file']) . "\n"; if(isset($item['line']) && isset($item['file'])) $result .= "line $item[line] of " . basename($item['file']) . "\n";
$result .= "\n"; $result .= "\n";
@ -505,12 +518,7 @@ class Debug {
} }
} }
$result .= "</ul>"; $result .= "</ul>";
return $result;
if ($returnVal) {
return $result;
} else {
echo $result;
}
} }
/** /**