diff --git a/ChangeLog b/ChangeLog index fb872d2c6..dd549dd2e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2001-11-17 Loïc Chapeaux + * libraries/display_tbl.lib.php3, lines 85-86: fixed bug #482627 - show + full processlist should have 'kill'. + 2001-11-16 Loïc Chapeaux * tbl_indexes.php3: merged Michal fix. * db_details.php3, line 47; main.php3, line 32; diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3 index ad02f8374..5f96fe550 100644 --- a/libraries/display_tbl.lib.php3 +++ b/libraries/display_tbl.lib.php3 @@ -82,8 +82,8 @@ if (!defined('__LIB_DISPLAY_TBL__')){ // 2.2 Statement is a "SHOW..." else if ($GLOBALS['is_show']) { // 2.2.1 TODO : defines edit/delete links depending on show statement - $tmp = eregi('^SHOW[[:space:]]+(VARIABLES|PROCESSLIST|STATUS|TABLE|GRANTS|CREATE|LOGS)', $GLOBALS['sql_query'], $which); - if (strtoupper($which[1]) == 'PROCESSLIST') { + $tmp = eregi('^SHOW[[:space:]]+(VARIABLES|(FULL[[:space:]]+)?PROCESSLIST|STATUS|TABLE|GRANTS|CREATE|LOGS)', $GLOBALS['sql_query'], $which); + if (strpos(' ' . strtoupper($which[1]), 'PROCESSLIST') > 0) { $do_display['edit_lnk'] = 'nn'; // no edit link $do_display['del_lnk'] = 'kp'; // "kill process" type edit link }