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

bug #1032066 Import Files has no submit

Browse Source
This commit is contained in:
Marc Delisle 2004-09-22 21:38:54 +00:00
parent 560447e2c7
commit 32d7197fa9
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -5,7 +5,13 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-09-20 Michal Čihař <michal@cihar.com>
2004-09-22 Marc Delisle <lem9@users.sourceforge.net>
* tbl_query_box.php, read_dump.php: bug #1032066: when no db was
selected from the left panel, the query window's Import Files had
no submit button; also, read_dump always tried a PMA_select_db($db)
even if $db was empty
2004-09-22 Michal Čihař <michal@cihar.com>
* lang/czech: Update.
* lang/sync_lang.sh: Default to iconv, as it doesn't break some
translations as recode does.

4
read_dump.php
View File

@ -254,7 +254,9 @@ if ($sql_query != '') {
}
// Runs multiple queries
else if (PMA_DBI_select_db($db)) {
// (Possibly to create a db, so no db was selected in the
// left frame and $db is empty)
else if (empty($db) || PMA_DBI_select_db($db)) {
$mult = TRUE;
$info_msg = '';
$info_count = 0;

7
tbl_query_box.php
View File

@ -346,11 +346,14 @@ if (function_exists('PMA_set_enc_form')) {
$form_items++;
}
// Charset conversion options
// Charset conversion options and submit button
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 != ''){
// It's possible that $db is empty: no db was selected on the left
// panel and the user wants to execute a .sql file to create one)
// && isset($db) && $db != ''){
){
/*
if ($cfg['AllowAnywhereRecoding'] && $allow_recoding) {
$form_items++;