Ticket #27350: formatting-27350.diff

src/wp-includes/formatting.php

@@ -147 +147 @@
                 $dynamic_characters['apos'] = array_keys( $dynamic );
                 $dynamic_replacements['apos'] = array_values( $dynamic );
                 $dynamic = array();
-                
+
                 // Quoted Numbers like "42"
                 if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
                         $dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $opening_quote . '$1' . $closing_quote;
@@ -167 +167 @@
                 if ( '"' !== $closing_quote ) {
                         $dynamic[ '/"/' ] = $closing_quote;
                 }
-                
+
                 $dynamic_characters['quote'] = array_keys( $dynamic );
                 $dynamic_replacements['quote'] = array_values( $dynamic );
                 $dynamic = array();
-                
+
                 // Dashes and spaces
                 $dynamic[ '/---/' ] = $em_dash;
                 $dynamic[ '/(?<=' . $spaces . ')--(?=' . $spaces . ')/' ] = $em_dash;
@@ -387 +387 @@
 
         $pee = preg_replace('|<br />\s*<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|legend|section|article|aside|hgroup|header|footer|nav|figure|details|menu|summary)';
+        $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|details|menu|summary)\b';
         $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
         $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
         $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
@@ -414 +414 @@
 
         $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\s*\n/', ltrim($pee), -1, PREG_SPLIT_NO_EMPTY);
         $pee = '';
 
         foreach ( $pees as $tinkle ) {
-                $pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
+                if ( preg_match( '!</?blockquote([^>]*)>!', $tinkle) >= 1 ) {
+                        // pee inside blockquotes (prevent splashing)
+                        $blockquote = preg_replace('|<blockquote([^>]*)>|i', "<blockquote$1><p>", $tinkle);
+                        $blockquote = str_replace('</blockquote>', '</p></blockquote>', $blockquote);
+                        $pee .= $blockquote . "\n";
+                } elseif ( preg_match( '!</?' . $allblocks . '[^>]*>!', $tinkle ) >= 1 ) {
+                        $pee .= trim($tinkle, "\n") . "\n"; // avoid peeing on block elements in the stream
+                } else {
+                        $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>([^<]+)</(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>(<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);