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

Merge branch 'QA_4_6'

Browse Source
This commit is contained in:
Michal Čihař 2017-01-20 16:25:34 +01:00
commit c2fbfc148b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -84,6 +84,7 @@ phpMyAdmin - ChangeLog
- issue #12876 Fix possible PHP error in navigation
- issue #12881 Fix database search with newer php-gettext
- issue #12894 Fix linter error on unterminated variable name
- issue #12732 Fixed filtering for active processes
--- Older ChangeLogs can be found on our project website ---

2
libraries/server_status_processes.lib.php
View File

@ -113,7 +113,7 @@ function PMA_getHtmlForServerProcesslist()
$sql_query = 'SELECT * FROM `INFORMATION_SCHEMA`.`PROCESSLIST` ';
}
if (! empty($_REQUEST['showExecuting'])) {
$sql_query .= ' WHERE state = "executing" ';
$sql_query .= ' WHERE state != "" ';
}
if (!empty($_REQUEST['order_by_field']) && !empty($_REQUEST['sort_order'])) {
$sql_query .= ' ORDER BY '