From ca0e57eb0c65ac41ca24903e58ce0a8168eebf30 Mon Sep 17 00:00:00 2001
From: Urban Müller
Date: Fri, 12 Feb 2021 16:03:03 +0100
Subject: allow custom stack traces from exception handler

---
 it.class | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'it.class')

diff --git a/it.class b/it.class
index b97bd7c..67488a0 100644
--- a/it.class
+++ b/it.class
@@ -192,7 +192,7 @@ static function error($p = array(), $extra = null)
 	if (it::match('-', $p['timewindow']) && ($parts = explode("-", $p['timewindow'])))
 		list($p['graceperiod'], $p['timewindow']) = [$parts[0], $parts[1] - $parts[0]];
 	$p += array('blockmailid' => $GLOBALS['ULTRASITE'] . "." . md5($p['to']));
-	$trace = it_debug::backtrace(array('skiplevels' => $p['backtraceskip'], 'skipfiles' => $p['skipfiles'])); # moved in here for performance in mass error case
+	$trace = it_debug::backtrace(array('skiplevels' => $p['backtraceskip'], 'skipfiles' => $p['skipfiles'], 'trace' => $p['trace'])); # moved in here for performance in mass error case
 
 	@mkdir("/tmp/alertdata");
 	@chmod("/tmp/alertdata", 0777);
@@ -293,7 +293,7 @@ static function error($p = array(), $extra = null)
 				$body  = it::replace(array('(pw|passw|password\d*|secret)(\' => |\] => |=)[^&\s]*' => '$1$2********'), $body, array('utf8' => false));
 			}
 
-			$type = ($p['fatal'] || it::match('^\w+: Uncaught ', $p['title']) ? "Fatal: " : "Error: ");
+			$type = ($p['fatal'] ? "Fatal: " : "Error: ");
 			$debugparams = it::replace(['^debug_' => ""], it::grep('^debug_(.*)', array_keys($GLOBALS)));
 			if (!it::is_live() || array_diff($debugparams, it::match('[-\w]+', $GLOBALS['ULTRAHOME'], ['all' => true]), ["devel", "twin", "utf8check", gethostname()]))
 				$type = mb_strtolower($type);
-- 
cgit v1.2.3