Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 6652ed59e7fea2ea1ffe82aa4a7df5bc7678599d https://github.com/phpmyadmin/phpmyadmin/commit/6652ed59e7fea2ea1ffe82aa4a7d... Author: Michal Čihař <michal@cihar.com> Date: 2015-12-28 (Mon, 28 Dec 2015) Changed paths: M ChangeLog M libraries/kanji-encoding.lib.php Log Message: ----------- Fixed Kanji encoding in some specific cases The mb_detect_encoding can return false and we have to handle this situation. Fixes #11786 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 87fb774c027aa0dbe3c74b24109c9f5f126427f4 https://github.com/phpmyadmin/phpmyadmin/commit/87fb774c027aa0dbe3c74b24109c... Author: Michal Čihař <michal@cihar.com> Date: 2015-12-28 (Mon, 28 Dec 2015) Changed paths: M libraries/php-gettext/gettext.inc Log Message: ----------- Provide fallback for mb_detect_encoding This fix has been already applied to Kanji library, apply it to php-gettext as well. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: b30e0aa1945235ac8c474e1b5d320b772205ba60 https://github.com/phpmyadmin/phpmyadmin/commit/b30e0aa1945235ac8c474e1b5d32... Author: Michal Čihař <michal@cihar.com> Date: 2015-12-28 (Mon, 28 Dec 2015) Changed paths: M ChangeLog M libraries/kanji-encoding.lib.php M libraries/php-gettext/gettext.inc Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3cc092258f1e...b30e0aa19452