Callback: removes HTML from error message [Closes nette/mail#54]

dg · dg · commit 28d4e3e44fd3 · 2018-09-18T12:24:12.000+02:00
diff --git a/src/Utils/Callback.php b/src/Utils/Callback.php
@@ -68,7 +68,11 @@ public static function invokeSafe(string $function, array $args, callable $onErr
 	{
 		$prev = set_error_handler(function ($severity, $message, $file) use ($onError, &$prev, $function) {
 			if ($file === __FILE__) {
-				$msg = preg_replace("#^$function\(.*?\): #", '', $message);
+				$msg = $message;
+				if (ini_get('html_errors')) {
+					$msg = html_entity_decode(strip_tags($msg));
+				}
+				$msg = preg_replace("#^$function\(.*?\): #", '', $msg);
 				if ($onError($msg, $severity) !== false) {
 					return;
 				}

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,11 @@ public static function invokeSafe(string $function, array $args, callable $onErr`
`68`	`68`	`{`
`69`	`69`	`$prev = set_error_handler(function ($severity, $message, $file) use ($onError, &$prev, $function) {`
`70`	`70`	`if ($file === __FILE__) {`
`71`		`- $msg = preg_replace("#^$function\(.*?\): #", '', $message);`
	`71`	`+ $msg = $message;`
	`72`	`+ if (ini_get('html_errors')) {`
	`73`	`+ $msg = html_entity_decode(strip_tags($msg));`
	`74`	`+ }`
	`75`	`+ $msg = preg_replace("#^$function\(.*?\): #", '', $msg);`
`72`	`76`	`if ($onError($msg, $severity) !== false) {`
`73`	`77`	`return;`
`74`	`78`	`}`