git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: fatal hhvm error when outputting log messages in us-ascii charset
[plcapi.git]
/
src
/
Helper
/
Logger.php
diff --git
a/src/Helper/Logger.php
b/src/Helper/Logger.php
index
62f7d75
..
bf86aba
100644
(file)
--- a/
src/Helper/Logger.php
+++ b/
src/Helper/Logger.php
@@
-37,6
+37,11
@@
class Logger
*/
public function debugMessage($message, $encoding=null)
{
*/
public function debugMessage($message, $encoding=null)
{
+ // US-ASCII is a warning for PHP and a fatal for HHVM
+ if ($encoding == 'US-ASCII') {
+ $encoding = 'UTF-8';
+ }
+
if (PHP_SAPI != 'cli') {
$flags = ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE;
if ($encoding != null) {
if (PHP_SAPI != 'cli') {
$flags = ENT_COMPAT | ENT_HTML401 | ENT_SUBSTITUTE;
if ($encoding != null) {