Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1

ChangeLog

@@ -3,6 +3,7 @@ phpMyAdmin - ChangeLog
 
 4.1.3.0 (not yet released)
 - bug #3938 PDFDefaultPageSize doc and easy configurability
+- bug #4198 Hovering over pie chart gives fatal JS error
 
 4.1.2.0 (2013-12-23)
 - bug #4178 Quick edit for BIT type does not work

js/chart.js

@@ -520,7 +520,12 @@ JQPlotPieChart.prototype = new JQPlotChart();
 JQPlotPieChart.prototype.constructor = JQPlotPieChart;
 
 JQPlotPieChart.prototype.populateOptions = function (dataTable, options) {
-    var optional = {};
+    var optional = {
+        highlighter: {
+            formatString:'%s, %d',
+            useAxesFormatters: false
+        }
+    };
     var compulsory = {
         seriesDefaults : {
             renderer : $.jqplot.PieRenderer