Fix #11446 MySQL 5.7 and Variables page for an unprivileged user

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>

1 files changed, 35 insertions, 6 deletions

diff --git a/server_variables.php b/server_variables.php
index ac2bf5e0a2..b0708662a0 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -46,13 +46,42 @@ $doc_link = PMA_Util::showMySQLDocu('server_system_variables');
 $response->addHtml(PMA_getHtmlForSubPageHeader('variables', $doc_link));
 
 /**
- * Link templates
+ * Sends the queries and buffers the results
  */
-$response->addHtml(PMA_getHtmlForLinkTemplates());
+$serverVarsResult = $GLOBALS['dbi']->tryQuery('SHOW SESSION VARIABLES;');
 
-/**
- * Displays the page
- */
-$response->addHtml(PMA_getHtmlForServerVariables($variable_doc_links));
+if ($serverVarsResult !== false) {
+
+    $serverVarsSession = array();
+    while ($arr = $GLOBALS['dbi']->fetchRow($serverVarsResult)) {
+        $serverVarsSession[$arr[0]] = $arr[1];
+    }
+    $GLOBALS['dbi']->freeResult($serverVarsResult);
+
+    $serverVars = $GLOBALS['dbi']->fetchResult('SHOW GLOBAL VARIABLES;', 0, 1);
+
+    /**
+     * Link templates
+     */
+    $response->addHtml(PMA_getHtmlForLinkTemplates());
+
+    /**
+     * Displays the page
+     */
+    $response->addHtml(
+        PMA_getHtmlForServerVariables(
+            $variable_doc_links, $serverVars, $serverVarsSession
+        )
+    );
+} else {
+    /**
+     * Display the error message
+     */
+    $response->addHTML(
+        PMA_Message::error(
+            __('Not enough privilege to view server variables and settings.')
+        )->getDisplay()
+    );
+}
 
 exit;