Ticket #22085: 22085.diff

wp-includes/js/media-editor.js

@@ -448 +448 @@
                                 return media.post( 'send-attachment-to-editor', {
                                         nonce:      wp.media.view.settings.nonce.sendToEditor,
                                         attachment: options,
-                                        html:       html
+                                        html:       html,
+                                        post_id:    wp.media.view.settings.postId
                                 }).done( function( resp ) {
                                         wp.media.editor.insert( resp );
                                 });

wp-admin/includes/ajax-actions.php

@@ -1931 +1931 @@
         if ( 'attachment' != $post->post_type )
                 wp_send_json_error();
 
+        // If this attachment is unattached, attach it. Primarily a back compat thing.
+        if ( 0 == $post->post_parent && $insert_into_post_id = intval( $_POST['post_id'] ) ) {
+                wp_update_post( array( 'ID' => $id, 'post_parent' => $insert_into_post_id ) );
+        }
+
         $html = isset( $attachment['title'] ) ? $attachment['title'] : '';
         if ( ! empty( $attachment['url'] ) ) {
                 $rel = '';