From f66d1eec607f961422e5543967f9bcb518b17242 Mon Sep 17 00:00:00 2001
From: "Alexander M. Turek" <me@derrabus.de>
Date: Fri, 23 Jul 2004 08:26:46 +0000
Subject: [PATCH] Made phpMyAdmin aware that there is a charset called gbk.

---
 ChangeLog                       | 7 ++++++-
 libraries/config_import.lib.php | 1 +
 libraries/select_lang.lib.php   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 121d934c5..30dfec29f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,11 +5,16 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-07-23 Alexander M. Turek  <me@derrabus.de>
+    * config.inc.php, libraries/config_import.lib.php,
+      libraries/select_lang.lib.php: Made phpMyAdmin aware that there is a
+      charset called gbk.
+
 2004-07-20 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/serbian: Updated, thanks to Mihailo Stefanovic (mikis).
     * lang/catalan update, thanks to Xavier Navarro (xavin).
 
-2004-07-20 Alexander M. Turek  <ichkannchloggen@derrabus.de>
+2004-07-20 Alexander M. Turek  <me@derrabus.de>
     * Documentation.html: added note about php5.
 
 2004-07-18 Marc Delisle  <lem9@users.sourceforge.net>
diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php
index fb69b4ae3..66463ebba 100644
--- a/libraries/config_import.lib.php
+++ b/libraries/config_import.lib.php
@@ -1051,6 +1051,7 @@ if (!isset($cfg['AvailableCharsets'])) {
         'koi8-r',
         'big5',
         'gb2312',
+        'gbk',
         'utf-8',
         'utf-7',
         'x-user-defined',
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index ae604e527..d3b6011e4 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -244,6 +244,7 @@ $mysql_charset_map = array(
     'euc-jp'       => 'ujis',
     'euc-kr'       => 'euckr',
     'gb2312'       => 'gb2312',
+    'gbk'          => 'gbk',
     'iso-8859-1'   => 'latin1',
     'iso-8859-2'   => 'latin2',
     'iso-8859-7'   => 'greek',