Index: branches/5.1.x/core/kernel/application.php =================================================================== diff -u -N -r13987 -r14133 --- branches/5.1.x/core/kernel/application.php (.../application.php) (revision 13987) +++ branches/5.1.x/core/kernel/application.php (.../application.php) (revision 14133) @@ -1,6 +1,6 @@ $trace_info) { + if ( isset($trace_info['class']) ) { + $object = $trace_info['class']; + } + elseif ( isset($trace_info['object']) ) { + $object = get_class( $trace_info['object'] ); + } + else { + $object = ''; + } + + $type = isset($trace_info['type']) ? $trace_info['type'] : ''; + + // implode(', ', $trace_info['args']) + $ret[] = '#' . $level . ' ' . $object . $type . $trace_info['function'].'(...) called at [' . $trace_info['file'] . ':' . $trace_info['line'] . ']'; + } + + if ($return_result) { + return implode("\n", $ret); + } + + echo implode("\n", $ret); + } + + /** * Returns & blocks next ResourceId available in system * * @return int