From 6652ed59e7fea2ea1ffe82aa4a7df5bc7678599d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 28 Dec 2015 10:48:31 +0100 Subject: [PATCH] Fixed Kanji encoding in some specific cases MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The mb_detect_encoding can return false and we have to handle this situation. Fixes #11786 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/kanji-encoding.lib.php | 3 +++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index 858caa5449..d6a08b1a05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - issue #11783 Avoid syntax error in javascript messages on invalid PHP setting for max_input_vars - issue #11784 Properly handle errors in upacking zip archive - issue #11785 Set PHP's internal encoding to UTF-8 +- issue #11786 Fixed Kanji encoding in some specific cases 4.5.3.1 (2015-12-25) - issue #11774 Undefined offset 2 diff --git a/libraries/kanji-encoding.lib.php b/libraries/kanji-encoding.lib.php index 79222aa73d..b879c3c0fd 100644 --- a/libraries/kanji-encoding.lib.php +++ b/libraries/kanji-encoding.lib.php @@ -82,6 +82,9 @@ function PMA_Kanji_strConv($str, $enc, $kana) return $str; } $string_encoding = mb_detect_encoding($str, $kanji_encoding_list); + if ($string_encoding === false) { + $string_encoding = 'utf-8'; + } if ($kana == 'kana') { $dist = mb_convert_kana($str, 'KV', $string_encoding);