Merging from master

This commit is contained in:
lorilee
2010-07-20 15:28:21 -07:00
parent aa49b85fad
commit d621c84dbf

View File

@@ -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']);