Ticket #14674: 14674.5.diff

src/wp-includes/formatting.php

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

tests/phpunit/tests/formatting/Autop.php

@@ -312 +312 @@
                         'h4',
                         'h5',
                         'h6',
-                        'hr',
                         'fieldset',
                         'legend',
                         'section',
@@ -534 +533 @@
 
                 $this->assertEquals( $expected, trim( wpautop( $content ) ) );
         }
+
+        /**
+         * @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 ) ) );
+        }
 }