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

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server
2011-02-17 04:40:06 +01:00
parent 55ab82ce9e b02955420c
commit 8b0559db7d
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/database_interface.lib.php
View File

@@ -991,7 +991,6 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
if (PMA_MYSQL_MAJOR_VERSION < 2009) { if (PMA_MYSQL_MAJOR_VERSION < 2009) {
if (! empty($GLOBALS['collation_connection'])) { if (! empty($GLOBALS['collation_connection'])) {
PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE); PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);
$mysql_charset = explode('_', $GLOBALS['collation_connection']);
PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddslashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE); PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddslashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE);
} else { } else {
PMA_DBI_query("SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE); PMA_DBI_query("SET NAMES 'utf8' COLLATE 'utf8_general_ci';", $link, PMA_DBI_QUERY_STORE);

2
libraries/mysql_charsets.lib.php
View File

@@ -11,7 +11,7 @@ if (! defined('PHPMYADMIN')) {
/** /**
* *
*/ */
if (PMA_MYSQL_MAJOR_VERSION > 2009) { if (PMA_MYSQL_MAJOR_VERSION >= 2009) {
/* There are no charsets in Drizzle */ /* There are no charsets in Drizzle */
$GLOBALS['mysql_charsets'] = array(); $GLOBALS['mysql_charsets'] = array();
$GLOBALS['mysql_charsets_descriptions'] = array('utf8' => 'UTF-8 Unicode'); $GLOBALS['mysql_charsets_descriptions'] = array('utf8' => 'UTF-8 Unicode');