From c0bd19cfbb61b2986a1b034c4398b09d47647b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 6 Jun 2017 10:24:44 +0200 Subject: [PATCH] Fixed check for mbstring.func_overload MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It can be also empty string when disabled (at least on HHVM). Fixes #13316 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/common.inc.php | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 77b97f0c9e..1ad148fd10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.7.2 (not yet released) - issue #13314 Make theme selection keep current server - issue #13311 Fixed direct login for accounts without password +- issue #13316 Fixed check for mbstring.func_overload 4.7.1 (2017-05-25) - issue #13132 Always execute tracking queries as controluser diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 1a3782eee8..1ac2d238dc 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -460,8 +460,11 @@ $GLOBALS['PMA_Config']->checkErrors(); /** * As we try to handle charsets by ourself, mbstring overloads just * break it, see bug 1063821. + * + * We specifically use empty here as we are looking for anything else than + * empty value or 0. */ -if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') != '0') { +if (@extension_loaded('mbstring') && !empty(@ini_get('mbstring.func_overload'))) { PMA_fatalError( __( 'You have enabled mbstring.func_overload in your PHP '