From 25738352df8057b542eeac3237eb6fd1d3ba4289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 26 Jan 2016 15:05:24 +0100 Subject: [PATCH] Fallback to default collation connection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If user supplied wrong string we should gracefully fallback. Signed-off-by: Michal Čihař --- libraries/database_interface.lib.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 2e5dfe2da1..3bd8a99167 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -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';",