Changeset 33955

Timestamp:

09/08/2015 10:54:08 PM (9 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.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (2 diffs)
• tests/phpunit/tests/formatting/Autop.php (modified) (3 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;

trunk/tests/phpunit/tests/formatting/Autop.php

@@ -329 +329 @@
         );
 
+        // Check whitespace normalization.
         $content = array();
 
@@ -336 +337 @@
 
         $expected = join( "\n", $content );
-        $content = join( "\n\n", $content ); // WS difference
-
-        $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+        $input = join( "\n\n", $content ); // WS difference
+
+        $this->assertEquals( $expected, trim( wpautop( $input ) ) );
+
+        $input = join( "", $content ); // WS difference
+
+        $this->assertEquals( $expected, trim( wpautop( $input ) ) );
+
+        // Check whitespace addition.
+        $content = array();
+
+        foreach ( $blocks as $block ) {
+            $content[] = "<$block/>";
+        }
+
+        $expected = join( "\n", $content );
+        $input = join( "", $content );
+
+        $this->assertEquals( $expected, trim( wpautop( $input ) ) );
+
+        // Check whitespace addition with attributes.
+        $content = array();
+
+        foreach ( $blocks as $block ) {
+            $content[] = "<$block attr='value'>foo</$block>";
+        }
+
+        $expected = join( "\n", $content );
+        $input = join( "", $content );
+
+        $this->assertEquals( $expected, trim( wpautop( $input ) ) );
     }
 
@@ -421 +450 @@
                 "<p>Hello <!-- a\nhref='world' --></p>\n",
             ),
+            array(
+                "Hello <!-- <object>\n<param>\n<param>\n<embed>\n</embed>\n</object>\n -->",
+                "<p>Hello <!-- <object>\n<param>\n<param>\n<embed>\n</embed>\n</object>\n --></p>\n",
+            ),
+            array(
+                "Hello <!-- <object>\n<param/>\n<param/>\n<embed>\n</embed>\n</object>\n -->",
+                "<p>Hello <!-- <object>\n<param/>\n<param/>\n<embed>\n</embed>\n</object>\n --></p>\n",
+            ),
 /* Block elements inside comments will fail this test in all versions, it's not a regression.
             array(