Merge remote-tracking branch 'origin/master'

js/server_status_monitor.js

@@ -1136,7 +1136,10 @@ AJAX.registerOnload('server_status_monitor.js', function() {
     function addChart(chartObj, initialize) {
 
         var settings = {
-            title: chartObj.title,
+            title: {
+                text: chartObj.title,
+                escapeHtml: true
+            },
             grid: {
                 drawBorder: false,
                 shadow: false,

js/tbl_chart.js

@@ -70,7 +70,8 @@ AJAX.registerOnload('tbl_chart.js', function() {
             }
         },
         title: {
-            text: $('input[name="chartTitle"]').attr('value')
+            text: $('input[name="chartTitle"]').attr('value'),
+            escapeHtml: true
             //margin:20
         },
         legend: {
@@ -286,7 +287,8 @@ function PMA_queryChart(data, passedSettings, passedNonJqplotSettings)
 
     var settings = {
         title: {
-            text: ''
+            text: '',
+            escapeHtml: true
             //margin:20
         }
     };