nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made phpMyAdmin aware that there is a charset called gbk.

Browse Source
This commit is contained in:
Alexander M. Turek
2004-07-23 08:26:46 +00:00
parent 20b4fda0ae
commit f66d1eec60
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -5,11 +5,16 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2004-07-20 Marc Delisle <lem9@users.sourceforge.net>
* lang/serbian: Updated, thanks to Mihailo Stefanovic (mikis). * lang/serbian: Updated, thanks to Mihailo Stefanovic (mikis).
* lang/catalan update, thanks to Xavier Navarro (xavin). * 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. * Documentation.html: added note about php5.
2004-07-18 Marc Delisle <lem9@users.sourceforge.net> 2004-07-18 Marc Delisle <lem9@users.sourceforge.net>

1
libraries/config_import.lib.php
View File

@@ -1051,6 +1051,7 @@ if (!isset($cfg['AvailableCharsets'])) {
'koi8-r', 'koi8-r',
'big5', 'big5',
'gb2312', 'gb2312',
'gbk',
'utf-8', 'utf-8',
'utf-7', 'utf-7',
'x-user-defined', 'x-user-defined',

1
libraries/select_lang.lib.php
View File

@@ -244,6 +244,7 @@ $mysql_charset_map = array(
'euc-jp' => 'ujis', 'euc-jp' => 'ujis',
'euc-kr' => 'euckr', 'euc-kr' => 'euckr',
'gb2312' => 'gb2312', 'gb2312' => 'gb2312',
'gbk' => 'gbk',
'iso-8859-1' => 'latin1', 'iso-8859-1' => 'latin1',
'iso-8859-2' => 'latin2', 'iso-8859-2' => 'latin2',
'iso-8859-7' => 'greek', 'iso-8859-7' => 'greek',