diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 7f13d84357..fd6de50fc0 100644 --- a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -912,6 +912,14 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { p = dom.create( 'p' ); dom.insertAfter( p, captionParent ); editor.selection.setCursorLocation( p, 0 ); + + // If the image is selected and the user pastes "over" it, + // replace both the image and the caption elements with the pasted content. + // This matches the behavior when pasting over non-caption images. + if ( node.nodeName === 'IMG' ) { + editor.$( captionParent ).remove(); + } + editor.nodeChanged(); } else { // Clicking Indent or Outdent while an image with a caption is selected breaks the caption.