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

Fallback to default collation connection

Browse Source 
If user supplied wrong string we should gracefully fallback.

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-01-26 15:05:24 +01:00
parent 7056ca9458
commit 25738352df
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/database_interface.lib.php
View File

@ -1567,11 +1567,22 @@ function PMA_DBI_postConnect($link, $is_controluser = false)
PMA_DBI_query("SET CHARACTER SET 'utf8';", $link, PMA_DBI_QUERY_STORE);
$set_collation_con_query = "SET collation_connection = '"
. PMA_Util::sqlAddSlashes($GLOBALS['collation_connection']) . "';";
PMA_DBI_query(
$result = PMA_DBI_try_query(
$set_collation_con_query,
$link,
PMA_DBI_QUERY_STORE
);
if ($result === false) {
trigger_error(
__('Failed to set configured collation connection!'),
E_USER_WARNING
);
$result = PMA_DBI_query(
"SET collation_connection = 'utf8_general_ci'",
$link,
PMA_DBI_QUERY_STORE
);
}
} else {
PMA_DBI_query(
"SET NAMES 'utf8' COLLATE 'utf8_general_ci';",