From 78bd6139822abfb101fa61aeff408c670894f789 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 3 May 2004 08:49:21 +0000
Subject: [PATCH] Stray <li> (bug #946530).

---
 ChangeLog         |  1 +
 tbl_query_box.php | 10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 090bf1b00..fb1400871 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ $Source$
 
 2004-05-03 Michal Cihar  <michal@cihar.com>
     * querywindow.php: Fix javascript error (bug #946823).
+    * tbl_query_box.php: Stray <li> (bug #946530).
 
 2004-05-03 Garvin Hicking <pma@supergarv.de>
     * left.php: Bug #946501 - Nested table now also work with aliased
diff --git a/tbl_query_box.php b/tbl_query_box.php
index 1d9c69f48..880490192 100644
--- a/tbl_query_box.php
+++ b/tbl_query_box.php
@@ -90,7 +90,6 @@ if ($cfg['QueryFrame'] && (!$cfg['QueryFrameJS'] && !$db || ($cfg['QueryFrameJS'
 
 $form_items = 0;
 
-echo "<li>\n";
 if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow) {
 ?>
         <script type="text/javascript">
@@ -104,6 +103,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow)
 <?php
 } else {
 ?>
+    <li>
         <form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">
 <?php
 }
@@ -380,9 +380,9 @@ if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_insi
         }
 }
 ?>
-</form>
-</li>
+    </form>
 <?php
+if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "</li>\n";
 if (!isset($is_inside_querywindow) ||
     (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'files' || $querydisplay_tab == 'full')) && isset($db) && $db != '') {
 
@@ -390,9 +390,9 @@ if (!isset($is_inside_querywindow) ||
     $ldi_target = 'ldi_table.php?' . $url_query . (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE ? '&amp;focus_querywindow=true' : '');
 
     if ($is_upload && isset($db) && isset($table)) {
+        if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "<li>\n";
         ?>
         <!-- Insert a text file -->
-        <li>
             <?php
             if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
             ?>
@@ -420,8 +420,8 @@ if (!isset($is_inside_querywindow) ||
             <noscript>
                <a href="<?php echo $ldi_target; ?>"><?php echo $strInsertTextfiles; ?></a>
             </noscript>
-        </li>
         <?php
+        if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "</li>\n";
     }
 }
 echo "\n";