Changeset 45574

Timestamp:

06/28/2019 07:15:31 AM (5 years ago)

Author:

pento

Message:

Formatting: Add correct <p> tags near <hr> tags.

It can be tricky to know when wpautop() should add <p> tags, but one thing we can be certain about is that they really shouldn't be anywhere near <hr> tags.

Now they aren't.

Props solarissmoke, MattyRob, pento.
Fixes #14674.

Location:

trunk

Files:

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

trunk/src/wp-includes/formatting.php

@@ -500 +500 @@
     // Add a double line break below block-level closing tags.
     $pee = preg_replace( '!(</' . $allblocks . '>)!', "$1\n\n", $pee );
+
+    // Add a double line break after hr tags, which are self closing.
+    $pee = preg_replace( '!(<hr\s*?/?>)!', "$1\n\n", $pee );
 
     // Standardize newline characters to "\n".

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

@@ -313 +313 @@
             'h5',
             'h6',
-            'hr',
             'fieldset',
             'legend',
@@ -559 +558 @@
     }
 
+    /**
+     * @ticket 14674
+     */
+    function test_the_hr_is_not_peed() {
+        $content  = 'paragraph1<hr>paragraph2';
+        $expected = "<p>paragraph1</p>\n<hr>\n<p>paragraph2</p>";
+
+        $this->assertEquals( $expected, trim( wpautop( $content ) ) );
+    }
 }