Changeset 33955 for trunk/src/wp-includes/formatting.php

Timestamp:

09/08/2015 10:54:08 PM (11 years ago)

Author:

azaozz

Message:

Formatting: maintain the content of HTML comments when they contain <object> tags. Add more tests for wpaitop().

Props miqrogroove.
Fixes #33645 for trunk.

File:

• trunk/src/wp-includes/formatting.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -497 +497 @@
 
         // Add a single line break above block-level opening tags.
-        $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
+        $pee = preg_replace('!(<' . $allblocks . '[\s/>])!', "\n$1", $pee);
 
         // Add a double line break below block-level closing tags.
@@ -597 +597 @@
 
         // Restore newlines in all elements.
-        $pee = str_replace( " <!-- wpnl --> ", "\n", $pee );
+        if ( false !== strpos( $pee, '<!-- wpnl -->' ) ) {
+                $pee = str_replace( array( ' <!-- wpnl --> ', '<!-- wpnl -->' ), "\n", $pee );
+        }
 
         return $pee;