summaryrefslogtreecommitdiffstats
path: root/XML_Util-pr8.patch
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2017-02-23 07:27:18 +0100
committerRemi Collet <fedora@famillecollet.com>2017-02-23 07:27:18 +0100
commita441017d0b2d65760e37da432927e1df62fcb6ae (patch)
treee21c703694241e5d86655f8ca3783f2ae21eda44 /XML_Util-pr8.patch
parenta128876c1cc70e9524e8d08e707829224cb2721d (diff)
php-pear: XML_Util 1.4.2
Diffstat (limited to 'XML_Util-pr8.patch')
-rw-r--r--XML_Util-pr8.patch26
1 files changed, 0 insertions, 26 deletions
diff --git a/XML_Util-pr8.patch b/XML_Util-pr8.patch
deleted file mode 100644
index 2a41893..0000000
--- a/XML_Util-pr8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 59e2d9738dd25cd751b810e5431b96e836864152 Mon Sep 17 00:00:00 2001
-From: Remi Collet <fedora@famillecollet.com>
-Date: Wed, 22 Feb 2017 11:39:37 +0100
-Subject: [PATCH] Fix #21184, collapseEmptyTags breaks XML_Serializer
-
----
- XML/Util.php | 2 +-
- package.xml | 1 +
- tests/Bug21184Tests.php | 18 ++++++++++++++++++
- 3 files changed, 20 insertions(+), 1 deletion(-)
- create mode 100644 tests/Bug21184Tests.php
-
-diff --git a/XML/Util.php b/XML/Util.php
-index af8211b..0bb7e5e 100644
---- a/XML/Util.php
-+++ b/XML/Util.php
-@@ -483,7 +483,7 @@ public static function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL)
- '${4}' . // attributes
- ' />'
- ;
-- return preg_replace($preg1, $preg2, $xml);
-+ return (preg_replace($preg1, $preg2, $xml)?:$xml);
- break;
- case XML_UTIL_COLLAPSE_XHTML_ONLY:
- return preg_replace(
-