From 77922b22e4abd173646e5c694c8a8a584dabbce5 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 27 Jan 2016 21:39:52 +1100 Subject: [PATCH] fix #11881 Full processlist lost on refresh Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/server_status_processes.lib.php | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 743183a2f7..b6e2b56f70 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - issue Undefined index: is_ajax_request - issue #11855 Fix password change on MariaDB 10.1 and newer - issue #11874 Validate version information before further processing it +- issue #11881 Full processlist lost on refresh 4.5.4.0 (not yet released) - issue #11724 live data edit of big sets is not working diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php index a5cdf73e77..c00c0c2d18 100644 --- a/libraries/server_status_processes.lib.php +++ b/libraries/server_status_processes.lib.php @@ -165,6 +165,9 @@ function PMA_getHtmlForServerProcesslist() if ($is_sorted && $_REQUEST['sort_order'] === 'ASC') { $column['sort_order'] = 'DESC'; } + if (isset($_REQUEST['showExecuting'])) { + $column['showExecuting'] = 'on'; + } $retval .= ''; $columnUrl = PMA_URL_getCommon($column); @@ -244,7 +247,12 @@ function PMA_getHtmlForProcessListFilter() } $url_params = array( - 'ajax_request' => true + 'ajax_request' => true, + 'full' => (isset($_REQUEST['full']) ? $_REQUEST['full'] : ''), + 'column_name' => (isset($_REQUEST['column_name']) ? $_REQUEST['column_name'] : ''), + 'order_by_field' + => (isset($_REQUEST['order_by_field']) ? $_REQUEST['order_by_field'] : ''), + 'sort_order' => (isset($_REQUEST['sort_order']) ? $_REQUEST['sort_order'] : ''), ); $retval = '';