Merge branch 'QA_4_6'

1 files changed, 0 insertions, 15 deletions

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.
  */