diff options
| author | Marc Delisle <marc@infomarc.info> | 2014-08-17 20:40:53 +0400 |
|---|---|---|
| committer | Marc Delisle <marc@infomarc.info> | 2014-08-17 20:40:53 +0400 |
| commit | 38b8cd7a803f314fbe2975fa39273839875f60ea (patch) | |
| tree | b10f3007a2f543a15e59ef8a62f5d1936f6e8ce1 /js/tbl_chart.js | |
| parent | 0c7702518b87c61daae1c8b00a0f9f56f0ccad87 (diff) | |
| parent | 90ddeecf60fc029608b972e490b735f3a65ed0cb (diff) | |
Fix merge conflict
Signed-off-by: Marc Delisle <marc@infomarc.info>
Diffstat (limited to 'js/tbl_chart.js')
| -rw-r--r-- | js/tbl_chart.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/tbl_chart.js b/js/tbl_chart.js index 37e5d90325..1dafa0f5d0 100644 --- a/js/tbl_chart.js +++ b/js/tbl_chart.js @@ -47,7 +47,7 @@ function PMA_queryChart(data, columnNames, settings) { }, axes : { xaxis : { - label : settings.xaxisLabel + label : escapeHtml(settings.xaxisLabel) }, yaxis : { label : settings.yaxisLabel |