From 6e0a51520d4206a963781add558f9e5bb1c90887 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Thu, 20 Dec 2018 11:55:04 +0900 Subject: [PATCH] Don't encode Unicode when printing JSON error message --- common/framework/debug.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/framework/debug.php b/common/framework/debug.php index 9530a419f..b908c85ba 100644 --- a/common/framework/debug.php +++ b/common/framework/debug.php @@ -667,11 +667,13 @@ class Debug header('HTTP/1.1 500 Internal Server Error'); if ($_SERVER['REQUEST_METHOD'] === 'GET' || !isset($_SERVER['HTTP_X_REQUESTED_WITH'])) { + header('Content-Type: text/html; charset=UTF-8'); echo sprintf('%s%s', escape($title, false), escape($message, false)); } else { - echo json_encode(array('error' => -1, 'message' => escape($message, false))); + header('Content-Type: application/json; charset=UTF-8'); + echo json_encode(array('error' => -1, 'message' => escape($message, false)), \JSON_UNESCAPED_UNICODE); } } }