From e836694428b05df40381cf1fc0908c4a004493ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Tue, 15 Apr 2003 13:36:19 +0000
Subject: [PATCH] Only display charset selection when a DB is selected.

---
 ChangeLog          | 4 ++++
 tbl_query_box.php3 | 5 ++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index eea502295..f42cc535a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-04-15 Michal Cihar  <nijel@users.sourceforge.net>
+    * tbl_query_box.php3: Only display charset selection when a DB is
+      selected.
+
 2003-04-15 Garvin Hicking <me@supergarv.de>
     * footer.inc.php3, queryframe.php3: Changed anchor target
       and window name of queryframe as suggested by Armel
diff --git a/tbl_query_box.php3 b/tbl_query_box.php3
index 673bc2a3e..e130c557f 100755
--- a/tbl_query_box.php3
+++ b/tbl_query_box.php3
@@ -209,7 +209,10 @@ if (function_exists('PMA_set_enc_form')) {
 }
 
 // Charset conversion options
-if ($is_upload || $is_upload_dir) {
+if (($is_upload || $is_upload_dir) && 
+        (!isset($is_inside_querywindow) ||
+         (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full'))) 
+        && isset($db) && $db != ''){
     if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
         echo '    <div style="margin-bottom: 5px">' . "\n";
         $temp_charset = reset($cfg['AvailableCharsets']);