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

bug 1009791 remove non-UTF-8 choices

Browse Source
This commit is contained in:
Marc Delisle
2004-09-04 12:32:05 +00:00
parent cb2c07f371
commit ad774a1698
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@@ -6,7 +6,9 @@ $Id$
$Source$ $Source$
2004-09-04 Marc Delisle <lem9@users.sourceforge.net> 2004-09-04 Marc Delisle <lem9@users.sourceforge.net>
* sql.php: bug 899430: left frame problem when lower_case_table_names==2 * sql.php: bug #899430: left frame problem when lower_case_table_names==2
* libraries/database_interface.lib.php: bug #1009791: now remove non-UTF-8
choices from the drop-down (in main) for MySQL 4.1.x
2004-09-03 Marc Delisle <lem9@users.sourceforge.net> 2004-09-03 Marc Delisle <lem9@users.sourceforge.net>
* main.php, server_privileges.php, libraries/common.lib.php: * main.php, server_privileges.php, libraries/common.lib.php:
@@ -20,7 +22,7 @@ $Source$
versions 4.1.0 and 4.1.1. versions 4.1.0 and 4.1.1.
2004-09-01 Marc Delisle <lem9@users.sourceforge.net> 2004-09-01 Marc Delisle <lem9@users.sourceforge.net>
* libraries/auth/cookie.auth.lib.php: bug 939531: when people upgrade * libraries/auth/cookie.auth.lib.php: bug #939531: when people upgrade
phpMyAdmin on the same directory, the previous cookie pma_cookie_username phpMyAdmin on the same directory, the previous cookie pma_cookie_username
was used but produced an Undefined offset in blowfish.php, because was used but produced an Undefined offset in blowfish.php, because
on previous PMA versions it was not encoded the same way. Now this old on previous PMA versions it was not encoded the same way. Now this old
@@ -31,7 +33,7 @@ $Source$
* libraries/export/sql.php: Fix empty BLOB export (bug #1020052). * libraries/export/sql.php: Fix empty BLOB export (bug #1020052).
2004-08-29 Marc Delisle <lem9@users.sourceforge.net> 2004-08-29 Marc Delisle <lem9@users.sourceforge.net>
* server_privileges.php: bug 1007870, illegal mix of collations * server_privileges.php: bug #1007870, illegal mix of collations
for operation UNION for operation UNION
2004-08-28 Marc Delisle <lem9@users.sourceforge.net> 2004-08-28 Marc Delisle <lem9@users.sourceforge.net>
@@ -40,11 +42,11 @@ $Source$
support for VARBINARY and BINARY field types support for VARBINARY and BINARY field types
2004-08-27 Marc Delisle <lem9@users.sourceforge.net> 2004-08-27 Marc Delisle <lem9@users.sourceforge.net>
* tbl_relation.php, libraries/display_tbl.lib.php: bug 1016997, * tbl_relation.php, libraries/display_tbl.lib.php: bug #1016997,
wrong db name generated in SHOW KEYS wrong db name generated in SHOW KEYS
2004-08-26 Marc Delisle <lem9@users.sourceforge.net> 2004-08-26 Marc Delisle <lem9@users.sourceforge.net>
* index.php, libraries/common.lib.php: bug 1006011: now we save * index.php, libraries/common.lib.php: bug #1006011: now we save
the chosen connection collation into a cookie the chosen connection collation into a cookie
* lang/japanese: updated, thanks to Tadashi Jokagi (elf2000) * lang/japanese: updated, thanks to Tadashi Jokagi (elf2000)
* lang/hebrew, turkish: bug 1016609: <br> tags * lang/hebrew, turkish: bug 1016609: <br> tags

13
libraries/database_interface.lib.php
View File

@@ -145,6 +145,19 @@ function PMA_DBI_postConnect($link) {
} }
} }
// and we remove the non-UTF-8 choices to avoid confusion
if (!defined('PMA_REMOVED_NON_UTF_8')) {
$tmp_available_languages = $GLOBALS['available_languages'];
$GLOBALS['available_languages'] = array();
foreach ($tmp_available_languages AS $tmp_lang => $tmp_lang_data) {
if (substr($tmp_lang, -5) == 'utf-8') {
$GLOBALS['available_languages'][$tmp_lang] = $tmp_lang_data;
}
} // end foreach
unset($tmp_lang, $tmp_lang_data, $tmp_available_languages);
define('PMA_REMOVED_NON_UTF_8',1);
}
$mysql_charset = $GLOBALS['mysql_charset_map'][$GLOBALS['charset']]; $mysql_charset = $GLOBALS['mysql_charset_map'][$GLOBALS['charset']];
if (empty($collation_connection) || (strpos('_', $collation_connection) ? substr($collation_connection, 0, strpos('_', $collation_connection)) : $collation_connection) == $mysql_charset) { if (empty($collation_connection) || (strpos('_', $collation_connection) ? substr($collation_connection, 0, strpos('_', $collation_connection)) : $collation_connection) == $mysql_charset) {
PMA_DBI_query('SET NAMES ' . $mysql_charset . ';', $link, PMA_DBI_QUERY_STORE); PMA_DBI_query('SET NAMES ' . $mysql_charset . ';', $link, PMA_DBI_QUERY_STORE);