diff --git a/ChangeLog b/ChangeLog
index c7c97a67a..299020ed4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $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>
     * libraries/common.lib.php: feature request #1036254
       Add a link by MySQL-Error #1062 - Duplicate entry
diff --git a/tbl_query_box.php b/tbl_query_box.php
index b376e7d51..53a5d993c 100644
--- a/tbl_query_box.php
+++ b/tbl_query_box.php
@@ -9,7 +9,10 @@ require_once('./libraries/bookmark.lib.php');
 
 $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'));
 }
 
@@ -50,8 +53,6 @@ if (isset($db) && isset($table) && $table != '' && $db != '') {
 /**
  * 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')) {
     $locking   = 'onkeypress="document.sqlform.elements[\'LockFromUpdate\'].checked = true;"';
@@ -103,6 +104,8 @@ if ($cfg['QueryFrame'] && (!$cfg['QueryFrameJS'] && !$db || ($cfg['QueryFrameJS'
     }
 }
 $form_items = 0;
+// ($is_upload defined in common.lib.php)
+
 if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow) {
 ?>
         <script type="text/javascript">