Merge branch 'QA_4_6'

3 files changed, 15 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 2b5503ed5c..4f1e56c593 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@ phpMyAdmin - ChangeLog
 - issue #12338 Designer reverts to first saved ER after EACH relation create or delete
 - issue #12639 'Show trace' in Console generates JS error for functions in query's trace called without any arguments
 - issue #12366 Fix user creation with certain MariaDB setups
+- issue #12616 Refuse to work with mbstring.func_overload enabled
 
 4.6.4 (2016-08-16)
 - issue        [security] Weaknesses with cookie encryption, see PMASA-2016-29
diff --git a/index.php b/index.php
index c5ac1a1837..201289a07a 100644
--- a/index.php
+++ b/index.php
@@ -433,21 +433,6 @@ echo '</div>';
 echo '</div>';
 
 /**
- * As we try to handle charsets by ourself, mbstring overloads just
- * break it, see bug 1063821.
- */
-if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
-    trigger_error(
-        __(
-            'You have enabled mbstring.func_overload in your PHP '
-            . 'configuration. This option is incompatible with phpMyAdmin '
-            . 'and might cause some data to be corrupted!'
-        ),
-        E_USER_WARNING
-    );
-}
-
-/**
  * mbstring is used for handling multibytes inside parser, so it is good
  * to tell user something might be broken without it, see bug #1063149.
  */
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 522e5524c5..2d68c91810 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -469,6 +469,20 @@ if ($GLOBALS['text_dir'] == 'ltr') {
 $GLOBALS['PMA_Config']->checkPermissions();
 $GLOBALS['PMA_Config']->checkErrors();
 
+/**
+ * As we try to handle charsets by ourself, mbstring overloads just
+ * break it, see bug 1063821.
+ */
+if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') != '0') {
+    PMA_fatalError(
+        __(
+            'You have enabled mbstring.func_overload in your PHP '
+            . 'configuration. This option is incompatible with phpMyAdmin '
+            . 'and might cause some data to be corrupted!'
+        )
+    );
+}
+
 /******************************************************************************/
 /* setup servers                                       LABEL_setup_servers    */