tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

FIX Debug::caller() will now handle errors from outside function calls (#6029)

This commit is contained in:
Daniel Hensby 2016-09-19 22:03:22 +01:00 committed by Sam Minnée
parent e93a376332
commit 32d1856d40
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dev/Debug.php
View File

@ -89,11 +89,12 @@ class Debug {
*/
public static function caller() {
$bt = debug_backtrace();
$caller = $bt[2];
$caller = isset($bt[2]) ? $bt[2] : array();
$caller['line'] = $bt[1]['line'];
$caller['file'] = $bt[1]['file'];
if(!isset($caller['class'])) $caller['class'] = '';
if(!isset($caller['type'])) $caller['type'] = '';
if(!isset($caller['function'])) $caller['function'] = '';
return $caller;
}