From b974b567811db3461b7a0c8eb1bae1024904277d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 22 Jun 2016 13:07:32 +0200
Subject: [PATCH] Fixed rendering of chart of columns with HTML inside
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 js/tbl_chart.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index e4566ed6f4..f1699a7ba2 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -201,7 +201,7 @@ function drawChart() {
 
     var columnNames = [];
     $('select[name="chartXAxis"] option').each(function() {
-        columnNames.push($(this).text());
+        columnNames.push(escapeHtml($(this).text()));
     });
     try {
         currentChart = PMA_queryChart(chart_data, columnNames, currentSettings);
@@ -223,7 +223,7 @@ function extractDate(dateString) {
     var matches, match;
     var dateTimeRegExp = /[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/;
     var dateRegExp = /[0-9]{4}-[0-9]{2}-[0-9]{2}/;
-    
+
     matches = dateTimeRegExp.exec(dateString);
     if (matches != null && matches.length > 0) {
         match = matches[0];