diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-01-01 23:19:16 +0000 |
---|---|---|
committer | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-01-07 14:45:25 +0000 |
commit | db284388acd455d3f6bf42db3bb3b399e3f395e0 (patch) | |
tree | ba08dd6d6937bfb7ac4923ba10b306760aae4451 /meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch | |
parent | 7c3b03d569b028a10560b94d203d3057e2d7165c (diff) | |
download | meta-openembedded-contrib-paule/php.tar.gz |
phpmyadmin: update to 4.3.4paule/php
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.patch | 29 |
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 27eac77629..0000000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4504-security-Self-XSS-in-query-charts.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 90ddeecf60fc029608b972e490b735f3a65ed0cb Mon Sep 17 00:00:00 2001 -From: Madhura Jayaratne <madhura.cj@gmail.com> -Date: Sun, 17 Aug 2014 08:52:05 -0400 -Subject: [PATCH] bug #4504 [security] Self-XSS in query charts - -Upstream-status: Backport - -Signed-off-by: Marc Delisle <marc@infomarc.info> ---- - js/tbl_chart.js | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - - 4.2.7.0 (2014-07-31) -diff --git a/js/tbl_chart.js b/js/tbl_chart.js -index 943d4ae..04c9c40 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 --- -1.7.10.4 - |