mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-10-24 01:56:18 +02:00
Code Issues Releases Wiki Activity

Fix usages of json_encode which did not handle invalid UTF8 gracefully, fixes #1392

Browse Source
This commit is contained in:
Jordi Boggiano
2019-11-12 21:24:23 +01:00
parent e1af546a55
commit 12a76ad61e
16 changed files with 228 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Monolog/Formatter/HtmlFormatter.php
View File

@@ -11,6 +11,7 @@
namespace Monolog\Formatter;
use Monolog\Logger;
use Monolog\Utils;
/**
* Formats incoming records into an HTML table
@@ -133,9 +134,9 @@ class HtmlFormatter extends NormalizerFormatter
$data = $this->normalize($data);
if (version_compare(PHP_VERSION, '5.4.0', '>=')) {
return json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
return Utils::jsonEncode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE, true);
}
return str_replace('\\/', '/', json_encode($data));
return str_replace('\\/', '/', Utils::jsonEncode($data, null, true));
}
}