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

Stray <li> (bug #946530).

Browse Source
This commit is contained in:
Michal Čihař
2004-05-03 08:49:21 +00:00
parent f1cbd500f4
commit 78bd613982
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -7,6 +7,7 @@ $Source$
2004-05-03 Michal Cihar <michal@cihar.com> 2004-05-03 Michal Cihar <michal@cihar.com>
* querywindow.php: Fix javascript error (bug #946823). * querywindow.php: Fix javascript error (bug #946823).
* tbl_query_box.php: Stray <li> (bug #946530).
2004-05-03 Garvin Hicking <pma@supergarv.de> 2004-05-03 Garvin Hicking <pma@supergarv.de>
* left.php: Bug #946501 - Nested table now also work with aliased * left.php: Bug #946501 - Nested table now also work with aliased

10
tbl_query_box.php
View File

@@ -90,7 +90,6 @@ if ($cfg['QueryFrame'] && (!$cfg['QueryFrameJS'] && !$db || ($cfg['QueryFrameJS'
$form_items = 0; $form_items = 0;
echo "<li>\n";
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">
@@ -104,6 +103,7 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow)
<?php <?php
} else { } else {
?> ?>
<li>
<form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform"> <form method="post" action="read_dump.php"<?php if ($is_upload) echo ' enctype="multipart/form-data"'; ?> onsubmit="return checkSqlQuery(this)" name="sqlform">
<?php <?php
} }
@@ -380,9 +380,9 @@ if (!isset($is_inside_querywindow) || (isset($is_inside_querywindow) && $is_insi
} }
} }
?> ?>
</form> </form>
</li>
<?php <?php
if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "</li>\n";
if (!isset($is_inside_querywindow) || 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 != '') { (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' : ''); $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 ($is_upload && isset($db) && isset($table)) {
if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "<li>\n";
?> ?>
<!-- Insert a text file --> <!-- Insert a text file -->
<li>
<?php <?php
if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) { if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) {
?> ?>
@@ -420,8 +420,8 @@ if (!isset($is_inside_querywindow) ||
<noscript> <noscript>
<a href="<?php echo $ldi_target; ?>"><?php echo $strInsertTextfiles; ?></a> <a href="<?php echo $ldi_target; ?>"><?php echo $strInsertTextfiles; ?></a>
</noscript> </noscript>
</li>
<?php <?php
if (!isset($is_inside_querywindow) || !$is_inside_querywindow) echo "</li>\n";
} }
} }
echo "\n"; echo "\n";