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

bug 1050691, missing parameters

Browse Source
This commit is contained in:
Marc Delisle
2004-10-22 00:34:27 +00:00
parent d368bdc318
commit c53d409230
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-10-21 Marc Delisle <lem9@users.sourceforge.net>
* tbl_query_box.php: bug 1050691, missing parameters
2004-10-21 Michael Keck <mkkeck@users.sourceforge.net> 2004-10-21 Michael Keck <mkkeck@users.sourceforge.net>
* libraries/common.lib.php: feature request #1036254 * libraries/common.lib.php: feature request #1036254
Add a link by MySQL-Error #1062 - Duplicate entry Add a link by MySQL-Error #1062 - Duplicate entry

9
tbl_query_box.php
View File

@@ -9,7 +9,10 @@ require_once('./libraries/bookmark.lib.php');
$upload_dir_error=''; $upload_dir_error='';
if (!($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full'))) { // I don't see the purpose of the first 2 conditions
//if (!($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full'))) {
if (!(isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full'))) {
PMA_checkParameters(array('db','table','url_query')); PMA_checkParameters(array('db','table','url_query'));
} }
@@ -50,8 +53,6 @@ if (isset($db) && isset($table) && $table != '' && $db != '') {
/** /**
* Work on the table * Work on the table
*/ */
// loic1: defines whether file upload is available or not
// ($is_upload now defined in common.lib.php)
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full')) { if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full')) {
$locking = 'onkeypress="document.sqlform.elements[\'LockFromUpdate\'].checked = true;"'; $locking = 'onkeypress="document.sqlform.elements[\'LockFromUpdate\'].checked = true;"';
@@ -103,6 +104,8 @@ if ($cfg['QueryFrame'] && (!$cfg['QueryFrameJS'] && !$db || ($cfg['QueryFrameJS'
} }
} }
$form_items = 0; $form_items = 0;
// ($is_upload defined in common.lib.php)
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow) { if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow) {
?> ?>
<script type="text/javascript"> <script type="text/javascript">