Merge pull request #8320 from sbulen/21_err_log_tweak

[2.1] Fix blank screens in error log
SimpleMachines · Feb 4, 2025 · d5b91f9 · d5b91f9
2 parents b1a8718 + 9e1f256
commit d5b91f9
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Sources/Subs.php b/Sources/Subs.php
@@ -3993,7 +3993,7 @@ function highlight_php_code($code)
 
 	$oldlevel = error_reporting(0);
 
-	$buffer = str_replace(array("\n", "\r"), '', @highlight_string($code, true));
+	$buffer = str_replace(array("\n", "\r"), array('<br />', ''), @highlight_string($code, true));
 
 	error_reporting($oldlevel);
 
@@ -4003,6 +4003,10 @@ function highlight_php_code($code)
 	// PHP 8.3 changed the returned HTML.
 	$buffer = preg_replace('/^(<pre>)?<code[^>]*>|<\/code>(<\/pre>)?$/', '', $buffer);
 
+	// Remove line breaks inserted before & after the actual code in php < 8.3
+	$buffer = preg_replace('/^(<span\s[^>]*>)<br \/>/', '$1', $buffer);
+	$buffer = preg_replace('/<br \/>(<\/span[^>]*>)<br \/>$/', '$1', $buffer);
+
 	return strtr($buffer, ['\'' => '&#039;']);
 }