diff options
| author | Michal Čihař <michal@cihar.com> | 2017-11-29 13:00:17 +0300 |
|---|---|---|
| committer | Michal Čihař <michal@cihar.com> | 2017-11-29 16:16:31 +0300 |
| commit | 3b6a994dcdf2cbcfa23caa51b3719ba924aab20a (patch) | |
| tree | 8db6b6e7958f33c64e14b395fae03506cbe3c8cf /import.php | |
| parent | 63f5b90ad53613dc4529f0711b2cf1c3a7e55d3c (diff) | |
Move collation connection setting to user preferences
It is now handled same way as other user settings.
Issue #11688
Issue #13466
Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'import.php')
| -rw-r--r-- | import.php | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/import.php b/import.php index d5433df99e..dd1b929abb 100644 --- a/import.php +++ b/import.php @@ -569,10 +569,8 @@ if ($file_to_unlink != '') { // Reset charset back, if we did some changes if ($reset_charset) { - $GLOBALS['dbi']->query('SET CHARACTER SET utf8'); - $GLOBALS['dbi']->query( - 'SET SESSION collation_connection =\'' . $collation_connection . '\'' - ); + $GLOBALS['dbi']->query('SET CHARACTER SET ' . $GLOBALS['charset_connection']); + $GLOBALS['dbi']->setCollationConnection($collation_connection); } // Show correct message |