From d2ea090c2e831a65404b9e32b7af574eba75d2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 8 Jan 2018 15:18:58 +0100
Subject: [PATCH] Fixed fallback value for collation connection.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #13758

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                       | 1 +
 libraries/DatabaseInterface.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index eb4904f498..8dab5d9f44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.7.8 (not yet released)
 - issue #13914 Fixed resetting default setting values.
+- issue #13758 Fixed fallback value for collation connection.
 
 4.7.7 (2017-12-23)
 - issue #13865 Fixed displaying of formatted numeric values for some locales
diff --git a/libraries/DatabaseInterface.php b/libraries/DatabaseInterface.php
index e0e5c03f63..34d1299d1b 100644
--- a/libraries/DatabaseInterface.php
+++ b/libraries/DatabaseInterface.php
@@ -1420,7 +1420,7 @@ class DatabaseInterface
                 );
                 $this->query(
                     "SET collation_connection = '"
-                    . $this->escapeString($collation_connection, $link)
+                    . $this->escapeString($default_collation, $link)
                     . "';",
                     $link,
                     self::QUERY_STORE