From 050ba7b6ccb8c63fdf089791e14a3c2b7df72b01 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 25 May 2008 13:16:31 +0000
Subject: [PATCH] no longer need the global using_mb_charset as version 3 is
 utf-8-only

---
 libraries/string.lib.php | 15 +--------------
 main.php                 |  2 +-
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/libraries/string.lib.php b/libraries/string.lib.php
index 54eef96ac..0c5a50504 100644
--- a/libraries/string.lib.php
+++ b/libraries/string.lib.php
@@ -27,20 +27,7 @@
         PMA_dl('mbstring');
     }
 
-/**
- * windows-* and tis-620 are not supported and are not multibyte,
- * others can be ignored as they're not multibyte
- *
- * @global boolean $GLOBALS['using_mb_charset']
- */
-$GLOBALS['using_mb_charset'] =
-    substr($GLOBALS['charset'], 0, 8) != 'windows-' &&
-    substr($GLOBALS['charset'], 0, 9) != 'iso-8859-' &&
-    substr($GLOBALS['charset'], 0, 3) != 'cp-' &&
-    $GLOBALS['charset'] != 'koi8-r' &&
-    $GLOBALS['charset'] != 'tis-620';
-
-$GLOBALS['PMA_allow_mbstr'] = @function_exists('mb_strlen') && $GLOBALS['using_mb_charset'];
+$GLOBALS['PMA_allow_mbstr'] = @function_exists('mb_strlen');
 
 if ($GLOBALS['PMA_allow_mbstr']) {
     // the hebrew lang file uses iso-8859-8-i, encoded RTL,
diff --git a/main.php b/main.php
index f92f95693..d5831b548 100644
--- a/main.php
+++ b/main.php
@@ -264,7 +264,7 @@ if (@extension_loaded('mbstring') && @ini_get('mbstring.func_overload') > 1) {
  * Nijel: mbstring is used for handling multibyte inside parser, so it is good
  * to tell user something might be broken without it, see bug #1063149.
  */
-if ($GLOBALS['using_mb_charset'] && !@extension_loaded('mbstring')) {
+if (! @extension_loaded('mbstring')) {
     trigger_error($strMbExtensionMissing, E_USER_WARNING);
 }