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

old code

Browse Source
This commit is contained in:
Alexander M. Turek
2005-02-23 14:00:15 +00:00
parent 4a615250c7
commit 9e39fe6ee6
2 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -9,6 +9,8 @@ $Source$
* libraries/grab_globals.lib.php: More hotfixes against bug #1149381. * libraries/grab_globals.lib.php: More hotfixes against bug #1149381.
* libraries/mysql_charsets.lib.php: Detection for new Japanese charsets * libraries/mysql_charsets.lib.php: Detection for new Japanese charsets
(cp932 and eucjpms) that will be introduced with MySQL 5.0.3. (cp932 and eucjpms) that will be introduced with MySQL 5.0.3.
* libraries/select_lang.lib.php: Removed the UTF-8 deactivation code that
we had already commented out a long time ago.
2005-02-22 Alexander M. Turek <me@derrabus.de> 2005-02-22 Alexander M. Turek <me@derrabus.de>
* libraries/grab_globals.lib.php: Hotfix against bug #1149381 and parts * libraries/grab_globals.lib.php: Hotfix against bug #1149381 and parts

20
libraries/select_lang.lib.php
View File

@@ -219,26 +219,6 @@ if (!isset($cfg['DefaultLang']) && isset($cfgDefaultLang)) {
unset($cfgLang); unset($cfgLang);
} }
/**
*
* 2004-02-15 rabus: Deactivated the code temporarily:
* We need to allow UTF-8 in order to be MySQL 4.1 compatible!
// Disable UTF-8 if $cfg['AllowAnywhereRecoding'] has been set to FALSE.
if (!isset($cfg['AllowAnywhereRecoding']) || !$cfg['AllowAnywhereRecoding']) {
$available_language_files = $available_languages;
$available_languages = array();
foreach ($available_language_files AS $tmp_lang => $tmp_lang_data) {
if (substr($tmp_lang, -5) != 'utf-8') {
$available_languages[$tmp_lang] = $tmp_lang_data;
}
} // end while
unset($tmp_lang, $tmp_lang_data, $available_language_files);
} // end if
*
*/
// MySQL charsets map // MySQL charsets map
$mysql_charset_map = array( $mysql_charset_map = array(
'big5' => 'big5', 'big5' => 'big5',