Merge pull request #4920 from nupplaphil/install_mode

[friendica.git] / src / Core / System.php

diff --git a/src/Core/System.php b/src/Core/System.php
index 7b68f6131c820eb9991e3ae684f862872b5e601c..1db417eb88c4ac20dfcb34bea8563e2bc4b458a9 100644 (file)
--- a/src/Core/System.php
+++ b/src/Core/System.php
@@ -60,12 +60,12 @@ class System extends BaseObject
                $previous = ['class' => '', 'function' => ''];
 
                // The ignore list contains all functions that are only wrapper functions
-               $ignore = ['fetchUrl'];
+               $ignore = ['fetchUrl', 'call_user_func_array'];
 
                while ($func = array_pop($trace)) {
                        if (!empty($func['class'])) {
-                               // Don't show multiple calls from the same function (mostly used for "dba" class)
-                               if (($previous['class'] != $func['class']) && ($previous['function'] != 'q')) {
+                               // Don't show multiple calls from the "dba" class to show the essential parts of the callstack
+                               if ((($previous['class'] != $func['class']) || ($func['class'] != 'dba')) && ($previous['function'] != 'q')) {
                                        $classparts = explode("\\", $func['class']);
                                        $callstack[] = array_pop($classparts).'::'.$func['function'];
                                        $previous = $func;