nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Only display charset selection when a DB is selected.

Browse Source
This commit is contained in:
Michal Čihař
2003-04-15 13:36:19 +00:00
parent dee67a454a
commit e836694428
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $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> 2003-04-15 Garvin Hicking <me@supergarv.de>
* footer.inc.php3, queryframe.php3: Changed anchor target * footer.inc.php3, queryframe.php3: Changed anchor target
and window name of queryframe as suggested by Armel and window name of queryframe as suggested by Armel

5
tbl_query_box.php3
View File

@@ -209,7 +209,10 @@ if (function_exists('PMA_set_enc_form')) {
} }
// Charset conversion options // 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) { if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
echo ' <div style="margin-bottom: 5px">' . "\n"; echo ' <div style="margin-bottom: 5px">' . "\n";
$temp_charset = reset($cfg['AvailableCharsets']); $temp_charset = reset($cfg['AvailableCharsets']);