Ticket #20943: 20943.2.diff

wp-admin/js/editor.dev.js

@@ -177 +177 @@
 
                 pee = pee + '\n\n';
                 pee = pee.replace(/<br \/>\s*<br \/>/gi, '\n\n');
-                pee = pee.replace(new RegExp('(<(?:'+blocklist+')(?: [^>]*)?>)', 'gi'), '\n$1');
-                pee = pee.replace(new RegExp('(</(?:'+blocklist+')>)', 'gi'), '$1\n\n');
+                pee = pee.replace(new RegExp('(<(?:'+blocklist+')(?: [^>]*)?>)', 'gi'), '\n$1\n');
+                pee = pee.replace(new RegExp('(</(?:'+blocklist+')>)', 'gi'), '\n$1\n');
                 pee = pee.replace(/<hr( [^>]*)?>/gi, '<hr$1>\n\n'); // hr is self closing block element
                 pee = pee.replace(/\r\n|\r/g, '\n');
                 pee = pee.replace(/\n\s*\n+/g, '\n\n');

wp-includes/formatting.php

@@ -222 +222 @@
         $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|select|option|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)';
-        $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1", $pee);
-        $pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
+        $pee = preg_replace('!(<' . $allblocks . '[^>]*>)!', "\n$1\n", $pee);
+        $pee = preg_replace('!(</' . $allblocks . '>)!', "\n$1\n", $pee);
         $pee = str_replace(array("\r\n", "\r"), "\n", $pee); // cross-platform newlines
         if ( strpos($pee, '<object') !== false ) {
                 $pee = preg_replace('|\s*<param([^>]*)>\s*|', "<param$1>", $pee); // no pee inside object/embed