gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed rendering of chart of columns with HTML inside

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-06-22 13:07:32 +02:00
parent 9b6f64b8b9
commit b974b56781
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/tbl_chart.js
View File

@ -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];