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-4544-additional-fix-for-4.2.x.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-4544-additional-fix-for-4.2.x.patch')
-rw-r--r-- | meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch deleted file mode 100644 index e23f94b73f..0000000000 --- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin/0001-Bug-4544-additional-fix-for-4.2.x.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 304fb2b645b36a39e03b954fdbd567173ebe6448 Mon Sep 17 00:00:00 2001 -From: Marc Delisle <marc@infomarc.info> -Date: Wed, 1 Oct 2014 08:09:12 -0400 -Subject: [PATCH] Bug 4544: additional fix for 4.2.x - -Upstream-Status: Backport - -Signed-off-by: Marc Delisle <marc@infomarc.info> ---- - libraries/TableSearch.class.php | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php -index a0b3fa4..b7eb42f 100644 ---- a/libraries/TableSearch.class.php -+++ b/libraries/TableSearch.class.php -@@ -992,7 +992,8 @@ EOT; - $html_output .= '<td>' . $properties['collation'] . '</td>'; - $html_output .= '<td>' . $properties['func'] . '</td>'; - // here, the data-type attribute is needed for a date/time picker -- $html_output .= '<td data-type="' . $properties['type'] . '"' -+ $html_output .= '<td data-type="' -+ . htmlspecialchars($properties['type']) . '"' - . '>' . $properties['value'] . '</td>'; - $html_output .= '</tr>'; - //Displays hidden fields --- -1.7.10.4 - |