Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaurício Meneghini Fauth <mauricio@fauth.dev>2019-04-18 07:15:50 +0300
committerMaurício Meneghini Fauth <mauricio@fauth.dev>2019-04-18 07:15:50 +0300
commit990b9c019c12f6f22e0608d8339d56fab7173718 (patch)
treea82d28c2e416f357602bcb84b7d77367e2a07b95 /import.php
parent460351c53fb64ed12d0b8c504146a3b69d74ae09 (diff)
Fix issue when resetting charset in import.php
Related to 3b6a994dcdf2cbcfa23caa51b3719ba924aab20a Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
Diffstat (limited to 'import.php')
-rw-r--r--import.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/import.php b/import.php
index f73b6fd81f..7bd3b8f2d3 100644
--- a/import.php
+++ b/import.php
@@ -572,7 +572,7 @@ if ($file_to_unlink != '') {
// Reset charset back, if we did some changes
if ($reset_charset) {
$GLOBALS['dbi']->query('SET CHARACTER SET ' . $GLOBALS['charset_connection']);
- $GLOBALS['dbi']->setCollationConnection($collation_connection);
+ $GLOBALS['dbi']->setCollation($collation_connection);
}
// Show correct message