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:
authorMichal Čihař <mcihar@novell.com>2011-06-03 17:41:59 +0400
committerMichal Čihař <mcihar@novell.com>2011-06-03 17:41:59 +0400
commit8f54092c2d69420ab2ea543ea930777a69785bdd (patch)
treecc85dfd1bf6f4dfeced9ea1ffe60ad1c23afd20c /import.php
parent0841fce11adc5e4029eea41c256f403a7bd56f98 (diff)
Remove forgotten references to $charset
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 0b029e5c2f..8837af2fac 100644
--- a/import.php
+++ b/import.php
@@ -343,7 +343,7 @@ if ($import_file != 'none' && !$error) {
// Convert the file's charset if necessary
if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE && isset($charset_of_file)) {
- if ($charset_of_file != $charset) {
+ if ($charset_of_file != 'utf-8') {
$charset_conversion = TRUE;
}
} elseif (isset($charset_of_file) && $charset_of_file != 'utf8') {