diff options
| -rw-r--r-- | libraries/server_status_processes.lib.php | 8 | ||||
| -rw-r--r-- | server_status_processes.php | 3 | ||||
| -rw-r--r-- | test/libraries/PMA_server_status_processes_test.php | 6 |
3 files changed, 8 insertions, 9 deletions
diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php index c773d48d6d..839c7404e8 100644 --- a/libraries/server_status_processes.lib.php +++ b/libraries/server_status_processes.lib.php @@ -13,21 +13,19 @@ if (! defined('PHPMYADMIN')) { } /** - * Prints html for server status processes + * Prints html for auto refreshing processes list * * @return string */ -function PMA_getHtmlForServerProcesses() +function PMA_getHtmlForProcessListAutoRefresh() { - $retval = PMA_getHtmlForServerProcesslist(); - $notice = PMA_Message::notice( __( 'Note: Enabling the auto refresh here might cause ' . 'heavy traffic between the web server and the MySQL server.' ) )->getDisplay(); - $retval .= $notice . '<div class="tabLinks">'; + $retval = $notice . '<div class="tabLinks">'; $retval .= '<label>' . __('Refresh rate') . ': '; $retval .= PMA_ServerStatusData::getHtmlForRefreshList( 'refreshRate', diff --git a/server_status_processes.php b/server_status_processes.php index 5ea17198c7..015bd00d38 100644 --- a/server_status_processes.php +++ b/server_status_processes.php @@ -57,7 +57,8 @@ if ($response->isAjax() && !empty($_REQUEST['kill'])) { $response->addHTML('<div>'); $response->addHTML($ServerStatusData->getMenuHtml()); $response->addHTML(PMA_getHtmlForProcessListFilter()); - $response->addHTML(PMA_getHtmlForServerProcesses()); + $response->addHTML(PMA_getHtmlForServerProcesslist()); + $response->addHTML(PMA_getHtmlForProcessListAutoRefresh()); $response->addHTML('</div>'); } exit; diff --git a/test/libraries/PMA_server_status_processes_test.php b/test/libraries/PMA_server_status_processes_test.php index 25284e7677..1ed7541450 100644 --- a/test/libraries/PMA_server_status_processes_test.php +++ b/test/libraries/PMA_server_status_processes_test.php @@ -56,14 +56,14 @@ class PMA_ServerStatusProcesses_Test extends PHPUnit_Framework_TestCase } /** - * Test for PMA_getHtmlForServerProcesses + * Test for PMA_getHtmlForProcessListAutoRefresh * * @return void * @group medium */ - public function testPMAGetHtmlForServerProcesses() + public function testPMAGetHtmlForProcessListAutoRefresh() { - $html = PMA_getHtmlForServerProcesses(); + $html = PMA_getHtmlForProcessListAutoRefresh(); // Test Notice $this->assertContains( |