Ticket #27733: 27733.diff

wp-includes/formatting.php

@@ -275 +275 @@
                 $pee .= $last_pee;
         }
 
-        $pee = preg_replace('|<br />\s*<br />|', "\n\n", $pee);
+        $pee = preg_replace('|<br />[\r\n\t ]*<br />|', "\n\n", $pee);
         // Space things out a little
         $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|noscript|legend|section|article|aside|hgroup|header|footer|nav|figure|details|menu|summary)';
         $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
@@ -284 +284 @@
 
         if ( strpos( $pee, '</object>' ) !== false ) {
                 // no P/BR around param and embed
-                $pee = preg_replace( '|(<object[^>]*>)\s*|', '$1', $pee );
-                $pee = preg_replace( '|\s*</object>|', '</object>', $pee );
-                $pee = preg_replace( '%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee );
+                $pee = preg_replace( '|(<object[^>]*>)[\r\n\t ]*|', '$1', $pee );
+                $pee = preg_replace( '|[\r\n\t ]*</object>|', '</object>', $pee );
+                $pee = preg_replace( '%[\r\n\t ]*(</?(?:param|embed)[^>]*>)[\r\n\t ]*%', '$1', $pee );
         }
 
         if ( strpos( $pee, '<source' ) !== false || strpos( $pee, '<track' ) !== false ) {
                 // no P/BR around source and track
-                $pee = preg_replace( '%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee );
-                $pee = preg_replace( '%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee );
-                $pee = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee );
+                $pee = preg_replace( '%([<\[](?:audio|video)[^>\]]*[>\]])[\r\n\t ]*%', '$1', $pee );
+                $pee = preg_replace( '%[\r\n\t ]*([<\[]/(?:audio|video)[>\]])%', '$1', $pee );
+                $pee = preg_replace( '%[\r\n\t ]*(<(?:source|track)[^>]*>)[\r\n\t ]*%', '$1', $pee );
         }
 
         $pee = preg_replace("/\n\n+/", "\n\n", $pee); // take care of duplicates
         // make paragraphs, including one at the end
-        $pees = preg_split('/\n\s*\n/', $pee, -1, PREG_SPLIT_NO_EMPTY);
+        $pees = preg_split('/\n[\r\n\t ]*\n/', $pee, -1, PREG_SPLIT_NO_EMPTY);
         $pee = '';
 
         foreach ( $pees as $tinkle ) {
                 $pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
         }
 
-        $pee = preg_replace('|<p>\s*</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
+        $pee = preg_replace('|<p>[\r\n\t ]*</p>|', '', $pee); // under certain strange conditions it could create a P of entirely whitespace
         $pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
-        $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee); // don't pee all over a tag
+        $pee = preg_replace('!<p>[\r\n\t ]*(</?' . $allblocks . '[^>]*>)[\r\n\t ]*</p>!', "$1", $pee); // don't pee all over a tag
         $pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee); // problem with nested lists
         $pee = preg_replace('|<p><blockquote([^>]*)>|i', "<blockquote$1><p>", $pee);
         $pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
-        $pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
-        $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+        $pee = preg_replace('!<p>[\r\n\t ]*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
+        $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)[\r\n\t ]*</p>!', "$1", $pee);
 
         if ( $br ) {
                 $pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
-                $pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee); // optionally make line breaks
+                $pee = preg_replace('|(?<!<br />)[\r\n\t ]*\n|', "<br />\n", $pee); // optionally make line breaks
                 $pee = str_replace('<WPPreserveNewline />', "\n", $pee);
         }
 
-        $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
-        $pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
+        $pee = preg_replace('!(</?' . $allblocks . '[^>]*>)[\r\n\t ]*<br />!', "$1", $pee);
+        $pee = preg_replace('!<br />([\r\n\t ]*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
         $pee = preg_replace( "|\n</p>$|", '</p>', $pee );
 
         if ( !empty($pre_tags) )