Ticket #29219: 29219.diff

src/wp-admin/js/editor.js

@@ -211 +211 @@
                         preserve_br = false,
                         blocklist = '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';
+                                '|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary';
 
                 if ( pee.indexOf( '<object' ) !== -1 ) {
                         pee = pee.replace( /<object[\s\S]+?<\/object>/g, function( a ) {

src/wp-includes/formatting.php

@@ -405 +405 @@
 
         $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|figcaption|details|menu|summary)';
         $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