Merge pull request #8438 from Sesquipedalian/3.0/err_log_tweak

Fixes blank screens when showing file content in error log

Author: Sesquipedalian

Sources/Actions/Admin/ErrorLog.php

@@ -430,7 +430,7 @@ public function viewFile(): void
 			ErrorHandler::fatalLang('error_bad_line');
 		}
 
-		$file_data = explode('<br />', Parser::highlightPhpCode(Utils::htmlspecialchars(file_get_contents($file))));
+		$file_data = preg_split('~\R|<br(\s*/)?>~', Parser::highlightPhpCode(Utils::htmlspecialchars(file_get_contents($file))));
 
 		// We don't want to slice off too many so lets make sure we stop at the last one
 		$max = min($max, max(array_keys($file_data)));

Sources/Parser.php

@@ -389,7 +389,7 @@ public static function highlightPhpCode(string $code): string
 			[
 				'~(?:' . Utils::TAB_SUBSTITUTE . ')+~u' => fn($matches) => '<span style="white-space: pre;">' . strtr($matches[0], [Utils::TAB_SUBSTITUTE => "\t"]) . '</span>',
 				'~<span style="color: #[0-9a-fA-F]{6}">(<span style="white-space: pre;">\h*</span>)</span>~' => fn($matches) => $matches[1],
-				'~\R~' => fn($matches) => '<br>',
+				'~\R~' => fn($matches) => '<br />',
 				'/\'/' => fn($matches) => '&#039;',
 				// PHP 8.3 changed the returned HTML.
 				'/^(<pre>)?<code[^>]*>|<\/code>(<\/pre>)?$/' => fn($matches) => '',