summaryrefslogtreecommitdiffstats
path: root/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2015-01-01 23:19:16 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2015-01-08 12:04:27 +0100
commit1601beb5a5867b0cf5cc8b54f3be31c607ef40a4 (patch)
tree9f25887d8dc3b893f3ff5f1f6f4bf352afc97930 /meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch
parent84f085314e2c46cb58e0ee7905ecbf646c545556 (diff)
downloadmeta-openembedded-1601beb5a5867b0cf5cc8b54f3be31c607ef40a4.tar.gz
phpmyadmin: update to 4.3.4
Drop patches merged upstream. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Diffstat (limited to 'meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch')
-rw-r--r--meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch29
1 files changed, 0 insertions, 29 deletions
diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch
deleted file mode 100644
index 27eac7762..000000000
--- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 90ddeecf60fc029608b972e490b735f3a65ed0cb Mon Sep 17 00:00:00 2001
2From: Madhura Jayaratne <madhura.cj@gmail.com>
3Date: Sun, 17 Aug 2014 08:52:05 -0400
4Subject: [PATCH] bug #4504 [security] Self-XSS in query charts
5
6Upstream-status: Backport
7
8Signed-off-by: Marc Delisle <marc@infomarc.info>
9---
10 js/tbl_chart.js | 2 +-
11 2 files changed, 2 insertions(+), 1 deletion(-)
12
13 4.2.7.0 (2014-07-31)
14diff --git a/js/tbl_chart.js b/js/tbl_chart.js
15index 943d4ae..04c9c40 100644
16--- a/js/tbl_chart.js
17+++ b/js/tbl_chart.js
18@@ -47,7 +47,7 @@ function PMA_queryChart(data, columnNames, settings) {
19 },
20 axes : {
21 xaxis : {
22- label : settings.xaxisLabel
23+ label : escapeHtml(settings.xaxisLabel)
24 },
25 yaxis : {
26 label : settings.yaxisLabel
27--
281.7.10.4
29