diff options
author | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-08-31 14:23:51 +0300 |
---|---|---|
committer | Madhura Jayaratne <madhura.cj@gmail.com> | 2015-08-31 14:23:51 +0300 |
commit | d3e8dac98c2f3eddac548944b7467f43b00edc71 (patch) | |
tree | d55d5403baf8395393597bfa499337d09be958d4 /server_status.php | |
parent | ca917746b6b0fa0952d3c622167c0164cd99aae1 (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.php')
-rw-r--r-- | server_status.php | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/server_status.php b/server_status.php index 8b0b34d940..a69b84c84f 100644 --- a/server_status.php +++ b/server_status.php @@ -23,15 +23,22 @@ if (PMA_DRIZZLE) { include_once 'libraries/replication_gui.lib.php'; } -$ServerStatusData = new PMA_ServerStatusData(); - /** * start output */ $response = PMA_Response::getInstance(); $response->addHTML('<div>'); -$response->addHTML($ServerStatusData->getMenuHtml()); -$response->addHTML(PMA_getHtmlForServerStatus($ServerStatusData)); -$response->addHTML('</div>'); +$serverStatusData = new PMA_ServerStatusData(); +$response->addHTML($serverStatusData->getMenuHtml()); +if ($serverStatusData->dataLoaded) { + $response->addHTML(PMA_getHtmlForServerStatus($serverStatusData)); +} else { + $response->addHTML( + PMA_Message::error( + __('Not enough privilege to view server status.') + )->getDisplay() + ); +} +$response->addHTML('</div>'); exit; |