Ticket #29171: 29171.2.patch

src/wp-includes/class-wp-editor.php

@@ -828 +828 @@
                         $settings['wpautop'] = false;
                         $settings['indent'] = true;
                         $settings['elementpath'] = false;
+                        $settings['wp_pad_empty_elements'] = true;
 
                         if ( is_rtl() ) {
                                 $settings['directionality'] = 'rtl';

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -131 +131 @@
                                         '/>';
                                 } );
                         }
+
+                        // Pad empty <span> and <a> that have attributes so they are not removed on cleanup.
+                        if ( editor.settings.wp_pad_empty_elements && event.format !== 'raw' ) {
+                                event.content = event.content.replace( /(<(a|span) [^>]+>)<\/\2>/gi, function( match, tag, tagName ) {
+                                        return tag.concat( '<wbr data-wp-empty-element-padding="1" />', '</', tagName, '>' );
+                                });
+                        }
                 }
         });
 
@@ -171 +178 @@
                                 return string || image;
                         });
                 }
+
+                // Remove the padding of empty elements.
+                if ( editor.settings.wp_pad_empty_elements && event.format !== 'raw' ) {
+                        event.content = event.content.replace( /<wbr data-wp-empty-element-padding="1" \/>/g, '' );
+                }
         });
 
         // Display the tag name instead of img in element path