Ticket #32003: 32003.patch

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

@@ -452 +452 @@
 
                                 if ( parent = dom.getParent( node, 'p' ) ) {
                                         parent.parentNode.insertBefore( wrap, parent );
-
-                                        if ( dom.isEmpty( parent ) ) {
-                                                dom.remove( parent );
-                                        }
                                 } else {
                                         node.parentNode.insertBefore( wrap, node );
                                 }
 
                                 editor.$( wrap ).find( 'dt.wp-caption-dt' ).append( node );
+
+                                if ( parent && dom.isEmpty( parent ) ) {
+                                        dom.remove( parent );
+                                }
                         }
                 } else if ( captionNode ) {
                         // Remove the caption wrapper and place the image in new paragraph
@@ -734 +734 @@
 
                                                 if ( parent = dom.getParent( node, 'p' ) ) {
                                                         parent.parentNode.insertBefore( wrap, parent );
-
-                                                        if ( dom.isEmpty( parent ) ) {
-                                                                dom.remove( parent );
-                                                        }
                                                 } else {
                                                         node.parentNode.insertBefore( wrap, node );
                                                 }
 
                                                 editor.$( wrap ).find( 'dt.wp-caption-dt' ).append( node );
+
+                                                if ( parent && dom.isEmpty( parent ) ) {
+                                                        dom.remove( parent );
+                                                }
                                         }
                                 } else {
                                         if ( wrap ) {