Merge pull request #9 from ashnazg/collapse

return original XML if preg fails
pear · Feb 22, 2017 · 937db09 · 937db09
2 parents 889f303 + 6e4933f
commit 937db09
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/XML/Util.php b/XML/Util.php
@@ -486,11 +486,13 @@ public static function collapseEmptyTags($xml, $mode = XML_UTIL_COLLAPSE_ALL)
                 return (preg_replace($preg1, $preg2, $xml)?:$xml);
                 break;
             case XML_UTIL_COLLAPSE_XHTML_ONLY:
-                return preg_replace(
-                    '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
-                    . 'param)([^>]*)><\/\\1>/s',
-                    '<\\1\\2 />',
-                    $xml
+                return (
+                    preg_replace(
+                        '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
+                        . 'param)([^>]*)><\/\\1>/s',
+                        '<\\1\\2 />',
+                        $xml
+                    ) ?: $xml
                 );
                 break;
             case XML_UTIL_COLLAPSE_NONE: