From 93b8065584b11d90f8ac66e8dd4cfd4d6eacdd3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 26 Apr 2004 08:34:12 +0000
Subject: [PATCH] mb_* functions don't know some windows-* charsets (bug
 #940638).

---
 ChangeLog                | 4 ++++
 libraries/string.lib.php | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 28023e0b3..d7ff4ae78 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-04-26 Michal Cihar  <michal@cihar.com>
+    * libraries/string.lib.php: mb_* functions don't know some windows-*
+      charsets (bug #940638).
+
 2004-04-22 Michal Cihar  <michal@cihar.com>
     * libraries/export/sql.php: Invalid SQL on empty table export (bug
       #939918).
diff --git a/libraries/string.lib.php b/libraries/string.lib.php
index a2ab3d982..13fc42f28 100644
--- a/libraries/string.lib.php
+++ b/libraries/string.lib.php
@@ -41,7 +41,8 @@ function PMA_strlen($string)
 {
     if (defined('PMA_MULTIBYTE_ENCODING')) {
         return mb_strlen($string);
-    } elseif($GLOBALS['PMA_has_mbstr']) {
+    // windows-* charsets are not multibyte and not supported by mb_*
+    } elseif($GLOBALS['PMA_has_mbstr'] && substr($GLOBALS['charset'],0,8) != 'windows-') {
         return mb_strlen($string, $GLOBALS['charset']);
     } else {
         return strlen($string);
@@ -65,7 +66,7 @@ function PMA_substr($string, $start, $length = 2147483647)
 {
     if (defined('PMA_MULTIBYTE_ENCODING')) {
         return mb_substr($string, $start, $length);
-    } elseif($GLOBALS['PMA_has_mbstr']) {
+    } elseif($GLOBALS['PMA_has_mbstr'] && substr($GLOBALS['charset'],0,8) != 'windows-') {
         return mb_substr($string, $start, $length, $GLOBALS['charset']);
     } else {
         return substr($string, $start, $length);