Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-08-31 14:23:51 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-08-31 14:23:51 +0300
commitd3e8dac98c2f3eddac548944b7467f43b00edc71 (patch)
treed55d5403baf8395393597bfa499337d09be958d4 /server_status_variables.php
parentca917746b6b0fa0952d3c622167c0164cd99aae1 (diff)
Fix #11445 MySQL 5.7 and Status page for an unprivileged user
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
Diffstat (limited to 'server_status_variables.php')
-rw-r--r--server_status_variables.php18
1 files changed, 13 insertions, 5 deletions
diff --git a/server_status_variables.php b/server_status_variables.php
index 2038dc5c42..735cc3aea6 100644
--- a/server_status_variables.php
+++ b/server_status_variables.php
@@ -36,7 +36,7 @@ if (isset($_REQUEST['flush'])) {
unset($_flush_commands);
}
-$ServerStatusData = new PMA_ServerStatusData();
+$serverStatusData = new PMA_ServerStatusData();
$response = PMA_Response::getInstance();
$header = $response->getHeader();
@@ -46,10 +46,18 @@ $scripts->addFile('jquery/jquery.tablesorter.js');
$scripts->addFile('server_status_sorter.js');
$response->addHTML('<div>');
-$response->addHTML($ServerStatusData->getMenuHtml());
-$response->addHTML(PMA_getHtmlForFilter($ServerStatusData));
-$response->addHTML(PMA_getHtmlForLinkSuggestions($ServerStatusData));
-$response->addHTML(PMA_getHtmlForVariablesList($ServerStatusData));
+$response->addHTML($serverStatusData->getMenuHtml());
+if ($serverStatusData->dataLoaded) {
+ $response->addHTML(PMA_getHtmlForFilter($serverStatusData));
+ $response->addHTML(PMA_getHtmlForLinkSuggestions($serverStatusData));
+ $response->addHTML(PMA_getHtmlForVariablesList($serverStatusData));
+} else {
+ $response->addHTML(
+ PMA_Message::error(
+ __('Not enough privilege to view status variables.')
+ )->getDisplay()
+ );
+}
$response->addHTML('</div>');
exit;