[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA4-296-g60933d6

[Michal Čihař]

The branch, master has been updated
       via  60933d667b3ebfb498a707ce2353de765c43c851 (commit)
      from  13fea458fb2e8b87f5928228b830006cc0f9d754 (commit)


- Log -----------------------------------------------------------------
commit 60933d667b3ebfb498a707ce2353de765c43c851
Author: Michal Čihař <michal at cihar.com>
Date:   Tue Mar 15 08:07:13 2011 +0100

    bug #3206876 [core] Work without mbstring installed.
    
    This is patch from upstream php-gettext, which will be included in next
    release there.

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                         |    1 +
 libraries/php-gettext/gettext.inc |   13 ++++++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e8165d..0bd7a8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -146,6 +146,7 @@
 - rfe #1312657 [dbi] Default to mysqli extension.
 - rfe #1168350 [interface] Add clear button to SQL edit box.
 - [core] Update library PHPExcel to version 1.7.6
+- bug #3206876 [core] Work without mbstring installed.
 
 3.3.10.0 (not yet released)
 - patch #3147400 [structure] Aria table size printed as unknown,
diff --git a/libraries/php-gettext/gettext.inc b/libraries/php-gettext/gettext.inc
index 00b9666..c9f7dc0 100644
--- a/libraries/php-gettext/gettext.inc
+++ b/libraries/php-gettext/gettext.inc
@@ -174,14 +174,13 @@ function _get_codeset($domain=null) {
  * Convert the given string to the encoding set by bind_textdomain_codeset.
  */
 function _encode($text) {
+  $target_encoding = _get_codeset();
+  if (function_exists("mb_detect_encoding")) {
     $source_encoding = mb_detect_encoding($text);
-    $target_encoding = _get_codeset();
-    if ($source_encoding != $target_encoding) {
-        return mb_convert_encoding($text, $target_encoding, $source_encoding);
-    }
-    else {
-        return $text;
-    }
+    if ($source_encoding != $target_encoding)
+      $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+  }
+  return $text;
 }
 
 


hooks/post-receive
-- 
phpMyAdmin