Ticket #39307: 39307.patch

src/wp-admin/js/editor.js

@@ -245 +245 @@
                                 });
                         }
 
+                        if ( text.indexOf( '<figure' ) !== -1 ) {
+                                text = text.replace( /<figure[\s\S]+?<\/figure>/g, function( a ) {
+                                        return a.replace( /\n+/g, '' );
+                                });
+                        }
+
                         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 inside <figure> elements, and before and after <figcaption>.
+        if ( strpos( $pee, '<figure' ) !== false ) {
+                $pee = preg_replace( '|(<figure[^>]*>)\s*|', '$1', $pee );
+                $pee = preg_replace( '|\s*</figure>|', '</figure>', $pee );
+                $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);