Ticket #33645: 33645-4.4-expanded.patch

src/wp-includes/formatting.php

@@ -496 +496 @@
         $allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
 
         // 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.
         $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
@@ -596 +596 @@
                 $pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
 
         // 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;
 }

tests/phpunit/tests/formatting/Autop.php

@@ -328 +328 @@
                         'summary',
                 );
 
+                // Check whitespace normalization.
                 $content = array();
 
                 foreach ( $blocks as $block ) {
@@ -335 +336 @@
                 }
 
                 $expected = join( "\n", $content );
-                $content = join( "\n\n", $content ); // WS difference
+                $input = join( "\n\n", $content ); // WS difference
 
-                $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+                $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 ) ) );
         }
 
         /**
@@ -420 +449 @@
                                 "Hello <!-- a\nhref='world' -->",
                                 "<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(
                                 "Hello <!-- <hr> a\nhref='world' -->",