Ticket #39307: 39307.2.patch

src/wp-admin/js/editor.js

@@ -118 +118 @@
 
                 // Replace paragraphs with double line breaks
                 function removep( html ) {
-                        var blocklist = 'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset',
+                        var blocklist = 'blockquote|ul|ol|li|dl|dt|dd|table|thead|tbody|tfoot|tr|th|td|h[1-6]|fieldset|figure',
                                 blocklist1 = blocklist + '|div|p',
                                 blocklist2 = blocklist + '|pre',
                                 preserve_linebreaks = false,
@@ -245 +245 @@
                                 });
                         }
 
+                        if ( text.indexOf( '<figcaption' ) !== -1 ) {
+                                text = text.replace( /\s*(<figcaption[^>]*>)/g, '$1' );
+                                text = text.replace( /<\/figcaption>\s*/g, '</figcaption>' );
+                        }
+
                         text = text.replace( /<[^<>]+>/g, function( a ) {
                                 return a.replace( /[\n\t ]+/g, ' ' );
                         });

src/wp-includes/formatting.php

@@ -506 +506 @@
                 $pee = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee );
         }
 
+        // Collapse line breaks before and after <figcaption> elements.
+        if ( strpos( $pee, '<figcaption' ) !== false ) {
+                $pee = preg_replace( '|\s*(<figcaption[^>]*>)|', '$1', $pee );
+                $pee = preg_replace( '|</figcaption>\s*|', '</figcaption>', $pee );
+        }
+
         // Remove more than two contiguous line breaks.
         $pee = preg_replace("/\n\n+/", "\n\n", $pee);