Merge branch 'QA_4_5'

phpmyadmin · Jan 27, 2016 · 439feae · 439feae
2 parents 63e9a60 + 77922b2
commit 439feae
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -42,6 +42,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
@@ -137,6 +137,9 @@ function PMA_getHtmlForServerProcesslist()
         if ($is_sorted && $_REQUEST['sort_order'] === 'ASC') {
             $column['sort_order'] = 'DESC';
         }
+        if (isset($_REQUEST['showExecuting'])) {
+            $column['showExecuting'] = 'on';
+        }
 
         $retval .= '<th>';
         $columnUrl = PMA_URL_getCommon($column);
@@ -216,7 +219,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  = '';