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ř 2016-06-16 13:16:30 +02:00
commit 8170e7fcbc
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server_status_processes.php
View File

@ -26,7 +26,8 @@ $response = PMA\libraries\Response::getInstance();
* on ajax request
*/
if ($response->isAjax() && !empty($_REQUEST['kill'])) {
$query = $GLOBALS['dbi']->getKillQuery((int)$_REQUEST['kill']);
$kill = intval($_REQUEST['kill']);
$query = $GLOBALS['dbi']->getKillQuery($kill);
if ($GLOBALS['dbi']->tryQuery($query)) {
$message = PMA\libraries\Message::success(
__('Thread %s was successfully killed.')
@ -41,7 +42,7 @@ if ($response->isAjax() && !empty($_REQUEST['kill'])) {
);
$response->setRequestStatus(false);
}
$message->addParam($_REQUEST['kill']);
$message->addParam($kill);
$response->addJSON('message', $message);
} elseif ($response->isAjax() && !empty($_REQUEST['refresh'])) {
// Only sends the process list table