Changeset 38592

Timestamp:

09/12/2016 07:05:28 AM (8 years ago)

Author:

pento

Message:

Formatting: Add an extra line break before block elements in wpautop().

wpautop() considers double line breaks to be the separator between block level HTML elements. By adding two line breaks before a block element, this allows us to process the text before a block element correctly.

Fixes #4857.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (1 diff)
• tests/phpunit/tests/formatting/Autop.php (modified) (1 diff)

trunk/src/wp-includes/formatting.php

@@ -470 +470 @@
 
     // Add a single line break above block-level opening tags.
-    $pee = preg_replace('!(<' . $allblocks . '[\s/>])!', "\n$1", $pee);
+    $pee = preg_replace('!(<' . $allblocks . '[\s/>])!', "\n\n$1", $pee);
 
     // Add a double line break below block-level closing tags.

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

@@ -525 +525 @@
     }
 
+
+    /**
+     * @ticket 4857
+     */
+    function test_that_text_before_blocks_is_peed() {
+        $content = 'a<div>b</div>';
+        $expected = "<p>a</p>\n<div>b</div>";
+
+        $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+    }
 }