From d621c84dbf7c275828ab714633bd862c298a9f53 Mon Sep 17 00:00:00 2001
From: lorilee <leelorik@gmail.com>
Date: Tue, 20 Jul 2010 15:28:21 -0700
Subject: [PATCH] Merging from master

---
 libraries/display_export.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 9fcfe5570..78b701a84 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -235,7 +235,7 @@ if (! empty($sql_query)) {
                 </li>
                 <?php
                 // charset of file
-                if ($cfg['AllowAnywhereRecoding']) {
+                if ($GLOBALS['PMA_recoding_engine'] != PMA_CHARSET_NONE) {
                     echo '        <li><label for="select_charset_of_file" class="desc">'
                         . __('Character set of the file:') . '</label>' . "\n";
                     reset($cfg['AvailableCharsets']);