This commit is contained in:
2021-07-27 14:11:04 +08:00
parent b0362ea68f
commit dcb588e02d
+3 -3
View File
@@ -843,7 +843,7 @@ if (!function_exists('jTraceEx')) {
* @param null $seen * @param null $seen
* @return string * @return string
*/ */
function jTraceEx($e, $seen = null): string function jTraceEx($e, $seen = null, $toHtml = false): string
{ {
$starter = $seen ? 'Caused by: ' : ''; $starter = $seen ? 'Caused by: ' : '';
$result = array(); $result = array();
@@ -866,9 +866,9 @@ if (!function_exists('jTraceEx')) {
$file = array_key_exists('file', $value) ? $value['file'] : 'Unknown Source'; $file = array_key_exists('file', $value) ? $value['file'] : 'Unknown Source';
$line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : null; $line = array_key_exists('file', $value) && array_key_exists('line', $value) && $value['line'] ? $value['line'] : null;
} }
$result = join("\n", $result); $result = join($toHtml ? "<br>" : "\n", $result);
if ($prev) { if ($prev) {
$result .= "\n" . jTraceEx($prev, $seen); $result .= ($toHtml ? "<br>" : "\n") . jTraceEx($prev, $seen, $toHtml);
} }
return $result; return $result;