cvs: pear /XML_Util Util.php

[email protected] ("Chuck Burgess") Mon, 05 May 2008 21:33:29 -0000
Newsgroups php.pear.cvs
Message-ID <cvsashnazg1210023209@cvsserver>
ashnazg		Mon May  5 21:33:29 2008 UTC

  Modified files:              
    /pear/XML_Util	Util.php 
  Log:
  PEAR #13839: Missing XHTML empty tags to collapse
  
http://cvs.php.net/viewvc.cgi/pear/XML_Util/Util.php?r1=1.35&r2=1.36&diff_format=u
Index: pear/XML_Util/Util.php
diff -u pear/XML_Util/Util.php:1.35 pear/XML_Util/Util.php:1.36
--- pear/XML_Util/Util.php:1.35	Mon May  5 17:06:11 2008
+++ pear/XML_Util/Util.php	Mon May  5 21:33:29 2008
@@ -43,7 +43,7 @@
  * @author    Stephan Schmidt <[email protected]>
  * @copyright 2003-2008 Stephan Schmidt <[email protected]>
  * @license   http://opensource.org/licenses/bsd-license New BSD License
- * @version   CVS: $Id: Util.php,v 1.35 2008/05/05 17:06:11 ashnazg Exp $
+ * @version   CVS: $Id: Util.php,v 1.36 2008/05/05 21:33:29 ashnazg Exp $
  * @link      http://pear.php.net/package/XML_Util
  */
 
@@ -423,7 +423,8 @@
     {
         if ($mode == XML_UTIL_COLLAPSE_XHTML_ONLY) {
             return preg_replace(
-                '/<(area|base|br|col|hr|img|input|link|meta|param)([^>]*)><\/\\1>/s',
+                '/<(area|base(?:font)?|br|col|frame|hr|img|input|isindex|link|meta|'
+                . 'param)([^>]*)><\/\\1>/s',
                 '<\\1\\2 />',
                 $xml);
         } else {