Merge branch 'QA_5_0'

Signed-off-by: William Desportes <williamdes@wdes.fr>

ChangeLog

@@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog
 - issue #15641 Fix replication actions where broken (start slave, stop slave, reset, ...)
 - issue #15608 Fix DisableIS is broken when with controluser configured (database list broken)
 - issue #15614 Fix undefined offset on index page for MySQL 5.7.8 (server charset)
+- issue #15692 Fix JavaScript error when user has not enough privilege to view query statistics.
 
 4.9.2 (2019-11-21)
 - issue #14184 Change the cookie name from phpMyAdmin to phpMyAdmin_https for HTTPS, fixes many "Failed to set session cookie" errors

js/server/status/queries.js

@@ -13,9 +13,11 @@
  * Unbind all event handlers before tearing down a page
  */
 AJAX.registerTeardown('server/status/queries.js', function () {
-    var queryPieChart = $('#serverstatusquerieschart').data('queryPieChart');
-    if (queryPieChart) {
-        queryPieChart.destroy();
+    if (document.getElementById('serverstatusquerieschart') !== null) {
+        var queryPieChart = $('#serverstatusquerieschart').data('queryPieChart');
+        if (queryPieChart) {
+            queryPieChart.destroy();
+        }
     }
 });
 
@@ -23,16 +25,18 @@ AJAX.registerOnload('server/status/queries.js', function () {
     // Build query statistics chart
     var cdata = [];
     try {
-        $.each($('#serverstatusquerieschart').data('chart'), function (key, value) {
-            cdata.push([key, parseInt(value, 10)]);
-        });
-        $('#serverstatusquerieschart').data(
-            'queryPieChart',
-            Functions.createProfilingChart(
-                'serverstatusquerieschart',
-                cdata
-            )
-        );
+        if (document.getElementById('serverstatusquerieschart') !== null) {
+            $.each($('#serverstatusquerieschart').data('chart'), function (key, value) {
+                cdata.push([key, parseInt(value, 10)]);
+            });
+            $('#serverstatusquerieschart').data(
+                'queryPieChart',
+                Functions.createProfilingChart(
+                    'serverstatusquerieschart',
+                    cdata
+                )
+            );
+        }
     } catch (exception) {
         // Could not load chart, no big deal...
     }