From db284388acd455d3f6bf42db3bb3b399e3f395e0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Thu, 1 Jan 2015 23:19:16 +0000 Subject: phpmyadmin: update to 4.3.4 Drop patches merged upstream. Signed-off-by: Paul Eggleton --- ...4505-security-XSS-in-view-operations-page.patch | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch (limited to 'meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch') diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch deleted file mode 100644 index 164a072ef8..0000000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-bug-4505-security-XSS-in-view-operations-page.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0cd293f5e13aa245e4a57b8d373597cc0e421b6f Mon Sep 17 00:00:00 2001 -From: Madhura Jayaratne -Date: Sun, 17 Aug 2014 08:41:57 -0400 -Subject: [PATCH] bug #4505 [security] XSS in view operations page - -Upstream-Status: Backport - -Signed-off-by: Marc Delisle ---- - ChangeLog | 3 +++ - js/functions.js | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ChangeLog b/ChangeLog -index 7afac1a..cec9d77 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,6 +1,9 @@ - phpMyAdmin - ChangeLog - ====================== - -+4.2.7.1 (2014-08-17) -+- bug #4505 [security] XSS in view operations page -+ - 4.2.7.0 (2014-07-31) - - bug Broken links on home page - - bug #4494 Overlap in navigation panel -diff --git a/js/functions.js b/js/functions.js -index 09bfeda..a970a81 100644 ---- a/js/functions.js -+++ b/js/functions.js -@@ -3585,7 +3585,7 @@ AJAX.registerOnload('functions.js', function () { - var question = PMA_messages.strDropTableStrongWarning + ' '; - question += $.sprintf( - PMA_messages.strDoYouReally, -- 'DROP VIEW ' + PMA_commonParams.get('table') -+ 'DROP VIEW ' + escapeHtml(PMA_commonParams.get('table')) - ); - - $(this).PMA_confirm(question, $(this).attr('href'), function (url) { --- -1.7.10.4 - -- cgit 1.2.3-korg