Bug #2565948
This commit is contained in:
@@ -24,6 +24,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
|
|||||||
+ patch #2506831 [privileges] Create user for existing database,
|
+ patch #2506831 [privileges] Create user for existing database,
|
||||||
thanks to Herman van Rink and Virsacer
|
thanks to Herman van Rink and Virsacer
|
||||||
+ patch #2505255 [privileges] Cleanup, thanks to Virsacer - virsacer
|
+ patch #2505255 [privileges] Cleanup, thanks to Virsacer - virsacer
|
||||||
|
+ bug #2565948 [core] Changing the connection collation changed the client
|
||||||
|
charset.
|
||||||
|
|
||||||
3.1.3.0 (not yet released)
|
3.1.3.0 (not yet released)
|
||||||
+ [lang] Turkish update, thanks to Burak Yavuz
|
+ [lang] Turkish update, thanks to Burak Yavuz
|
||||||
|
@@ -906,9 +906,9 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (! empty($GLOBALS['collation_connection'])) {
|
if (! empty($GLOBALS['collation_connection'])) {
|
||||||
|
PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);
|
||||||
$mysql_charset = explode('_', $GLOBALS['collation_connection']);
|
$mysql_charset = explode('_', $GLOBALS['collation_connection']);
|
||||||
PMA_DBI_query("SET NAMES '" . $mysql_charset[0] . "' COLLATE '" . $GLOBALS['collation_connection'] . "';",
|
PMA_DBI_query("SET collation_connection = '" . PMA_sqlAddslashes($GLOBALS['collation_connection']) . "';", $link, PMA_DBI_QUERY_STORE);
|
||||||
$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);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user