Ticket #38656: 38656.diff

src/wp-includes/formatting.php

@@ -466 +466 @@
         // Change multiple <br>s into two line breaks, which will turn into paragraphs.
         $pee = preg_replace('|<br\s*/?>\s*<br\s*/?>|', "\n\n", $pee);
 
-        $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)';
+        // Block level elements that can contain a <p>.
+        $peeblocks = 'caption|td|th|div|dd|dt|li|form|map|blockquote|address|fieldset|section|article|aside|header|footer|nav|figure|figcaption|details|menu';
+
+        // Block level elements that cannot contain a <p>.
+        $peefreeblocks = 'table|thead|tfoot|col|colgroup|tbody|tr|dl|ul|ol|pre|area|math|style|p|h[1-6]|hr|legend|hgroup|summary';
+
+        $allblocks     = "(?:$peeblocks|$peefreeblocks)";
+        $peeblocks     = "(?:$peeblocks)";
+        $peefreeblocks = "(?:$peefreeblocks)";
+
+        // Preserve newlines within pee-free blocks.
+        $pee = preg_replace_callback('/<(' . $peefreeblocks . ')( [^>]*)?>.*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
+
+        // ... but not the ones inside pee blocks inside pee free blocks.
+        $pee = preg_replace( '%(<(' . $peeblocks . ")(?: [^>]*)?>)>(.*?)<WPPreserveNewline />(.*?)(</\\2>)%s", "$1$3\n$4$5", $pee );
 
         // Add a double line break above block-level opening tags.
         $pee = preg_replace('!(<' . $allblocks . '[\s/>])!', "\n\n$1", $pee);
@@ -474 +488 @@
         // Add a double line break below block-level closing tags.
         $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
 
+        // Add a double line break below block-level opening tags that are allowed to contain a <p>.
+        $pee = preg_replace('%(<' . $peeblocks . '(?: [^>]*)?>)%', "$1\n\n", $pee);
+
+        // Add a double line break above block-level closing tags that are allowed to contain a <p>.
+        $pee = preg_replace('%(</' . $peeblocks . '>)%', "\n\n$1", $pee);
+
         // Standardize newline characters to "\n".
         $pee = str_replace(array("\r\n", "\r"), "\n", $pee);
 
@@ -506 +526 @@
                 $pee = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee );
         }
 
+        // If there's only one paragraph inside a pee block, remove the newlines.
+        $pee = preg_replace( '%(<(' . $peeblocks . ")(?: [^>]*)?>)\n\n((?(?!\n\n).)*)\n\n(</\\2>)%s", '$1$3$4', $pee );
+
         // Remove more than two contiguous line breaks.
         $pee = preg_replace("/\n\n+/", "\n\n", $pee);
 
@@ -520 +543 @@
                 $pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
         }
 
+        // Replace newline placeholders with newlines.
+        $pee = str_replace('<WPPreserveNewline />', "\n", $pee);
+
         // Under certain strange conditions it could create a P of entirely whitespace.
         $pee = preg_replace('|<p>\s*</p>|', '', $pee);
 

tests/phpunit/tests/formatting/Autop.php

@@ -534 +534 @@
 
                 $this->assertEquals( $expected, trim( wpautop( $content ) ) );
         }
+
+        /**
+         * @ticket 38656
+         */
+        function test_that_paragraphs_inside_blocks_without_starting_newlines_are_peed() {
+                $content = "<div>a\n\nb</div>";
+                $expected = "<div>\n<p>a</p>\n<p>b</p>\n</div>";
+
+                $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+        }
+
+        /**
+         * @ticket 38656
+         */
+        function test_that_paragraphs_inside_non_pee_blocks_without_starting_newlines_are_not_peed() {
+                $content = "<h1>a\n\nb</h1>";
+                $expected = "<h1>a<br />\nb</h1>";
+
+                $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+        }
 }