diff --git a/ChangeLog b/ChangeLog index 1fab40bbf8..e84ddc6fab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -92,6 +92,7 @@ VerboseMultiSubmit, ReplaceHelpImg 3.5.7.0 (not yet released) - bug #3779 [core] Problem with backslash in enum fields +- bug #3816 Missing server_processlist.php 3.5.6.0 (2013-01-28) - bug #3593604 [status] Erroneous advisor rule diff --git a/doc/config.rst b/doc/config.rst index 4c77ca2398..f46d0bf059 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -1711,7 +1711,6 @@ Tabs display settings * ``server_status.php`` * ``server_variables.php`` * ``server_privileges.php`` - * ``server_processlist.php`` .. config:option:: $cfg['DefaultTabDatabase'] diff --git a/libraries/ServerStatusData.class.php b/libraries/ServerStatusData.class.php index ddcc9d54dd..de23d47e87 100644 --- a/libraries/ServerStatusData.class.php +++ b/libraries/ServerStatusData.class.php @@ -228,8 +228,6 @@ class PMA_ServerStatusData PMA_generate_common_url(); $links['qcache']['doc'] = 'query_cache'; - //$links['threads'][__('Show processes')] - // = 'server_processlist.php?' . PMA_generate_common_url(); $links['threads']['doc'] = 'mysql_threads'; $links['key']['doc'] = 'myisam_key_cache'; diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 34964fac7c..5e0976827d 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -388,7 +388,6 @@ $goto_whitelist = array( 'server_export.php', 'server_import.php', 'server_privileges.php', - 'server_processlist.php', 'server_sql.php', 'server_status.php', 'server_status_advisor.php', diff --git a/libraries/config.default.php b/libraries/config.default.php index 1019d27687..8b1ce032e9 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -1171,7 +1171,6 @@ $cfg['PropertiesNumColumns'] = 1; * 'server_status.php' = runtime information * 'server_variables.php' = MySQL server variables * 'server_privileges.php' = user management - * 'server_processlist.php' = process list * * @global string $cfg['DefaultTabServer'] */ diff --git a/libraries/config.values.php b/libraries/config.values.php index a62bfb9a2f..b38526cf7c 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -75,8 +75,7 @@ $cfg_db['DefaultTabServer'] = array( 'server_databases.php', // list of databases 'server_status.php', // runtime information 'server_variables.php', // MySQL server variables - 'server_privileges.php', // user management - 'server_processlist.php' // process list + 'server_privileges.php' // user management ); $cfg_db['DefaultTabDatabase'] = array( 'db_structure.php', // tables list diff --git a/test/theme.php b/test/theme.php index f0309d6554..444c91de89 100644 --- a/test/theme.php +++ b/test/theme.php @@ -126,11 +126,6 @@ $tabs['binlog']['icon'] = 's_tbl.png'; $tabs['binlog']['link'] = 'server_binlog.php'; $tabs['binlog']['text'] = __('Binary log'); -$tabs['process']['icon'] = 's_process.png'; -$tabs['process']['link'] = 'server_processlist.php'; -$tabs['process']['text'] = 'caution'; -$tabs['process']['class'] = 'caution'; - $tabs['export']['icon'] = 'b_export.png'; $tabs['export']['text'] = 'disabled';