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

bug 857743

Browse Source
This commit is contained in:
Marc Delisle
2004-01-07 18:13:14 +00:00
parent 72701d3a1a
commit 13f274c4e7
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
2004-01-07 Marc Delisle <lem9@users.sourceforge.net>
* libraries/display_tbl.lib.php, /display_tbl_links.lib.php:
bug 857743, SHOW errors
2004-01-06 Alexander M. Turek <therising@derrabus.de>
* libraries/charset_conversion.lib.php: Skip charset conversion code if
input charset and output charset are the same.

4
libraries/display_tbl.lib.php
View File

@@ -93,7 +93,7 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total)
else if ($GLOBALS['is_show']) {
// 2.2.1 TODO : defines edit/delete links depending on show statement
$tmp = preg_match('@^SHOW[[:space:]]+(VARIABLES|(FULL[[:space:]]+)?PROCESSLIST|STATUS|TABLE|GRANTS|CREATE|LOGS|DATABASES|FIELDS)@i', $GLOBALS['sql_query'], $which);
if (strpos(' ' . strtoupper($which[1]), 'PROCESSLIST') > 0) {
if (isset($which[1]) && strpos(' ' . strtoupper($which[1]), 'PROCESSLIST') > 0) {
$do_display['edit_lnk'] = 'nn'; // no edit link
$do_display['del_lnk'] = 'kp'; // "kill process" type edit link
}
@@ -1488,7 +1488,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
}
if (!empty($del_url)) {
if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
$vertical_display['row_delete'][$row_no] .= ' <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
. ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
. ' </td>' . "\n";

2
libraries/display_tbl_links.lib.php
View File

@@ -2,7 +2,7 @@
/* $Id$ */
// vim: expandtab sw=4 ts=4 sts=4:
if (!empty($del_url)) {
if (!empty($del_url) && $is_display['del_lnk'] != 'kp') {
echo ' <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
. ' <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
. ' </td>' . "\n";