Merge pull request #4837 from annando/improved-callstack

Don't show multiple calls from the "dba" class
This commit is contained in:
Hypolite Petovan 2018-04-13 20:26:41 -04:00 committed by GitHub
commit ca614db66a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -64,8 +64,8 @@ class System extends BaseObject
while ($func = array_pop($trace)) { while ($func = array_pop($trace)) {
if (!empty($func['class'])) { if (!empty($func['class'])) {
// Don't show multiple calls from the same function (mostly used for "dba" class) // Don't show multiple calls from the "dba" class to show the essential parts of the callstack
if (($previous['class'] != $func['class']) && ($previous['function'] != 'q')) { if ((($previous['class'] != $func['class']) || ($func['class'] != 'dba')) && ($previous['function'] != 'q')) {
$classparts = explode("\\", $func['class']); $classparts = explode("\\", $func['class']);
$callstack[] = array_pop($classparts).'::'.$func['function']; $callstack[] = array_pop($classparts).'::'.$func['function'];
$previous = $func; $previous = $func;