Changeset 33624 for trunk/src/wp-includes/formatting.php

Timestamp:

08/17/2015 05:35:58 PM (10 years ago)

Author:

azaozz

Message:

Fix creating of extra <br /> tags in both PHP and JS variants of wpautop(). Add PHP tests to catch similar problems in the future.
Props valendesigns, azaozz. Fixes #33377.

File:

• trunk/src/wp-includes/formatting.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -492 +492 @@
     }
     // Change multiple <br>s into two line breaks, which will turn into paragraphs.
-    $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
+    $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)';
@@ -574 +574 @@
         // Replace newlines that shouldn't be touched with a placeholder.
         $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
+
+        // Normalize <br>
+        $pee = str_replace( array( '<br>', '<br/>' ), '<br />', $pee );
 
         // Replace any new line characters that aren't preceded by a <br /> with a <br />.