Ticket #21819: 21819.3.diff

src/wp-admin/custom-header.php

@@ -1187 +1187 @@
                 $attachment_id = wp_insert_attachment( $object, $cropped );
                 $metadata = wp_generate_attachment_metadata( $attachment_id, $cropped );
 
+                // If this is a crop, save the original attachment ID as metadata.
+                if ( $parent_id ) {
+                        $metadata['attachment_parent'] = $parent_id;
+                }
+                
                 /**
                  * Filters the header image attachment metadata.
                  *
@@ -1197 +1202 @@
                  * @param array $metadata Attachment metadata.
                  */
                 $metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata );
-                wp_update_attachment_metadata( $attachment_id, $metadata );
 
-                if ( $parent_id ) {
-                        $meta = add_post_meta( $attachment_id, '_wp_attachment_parent', $parent_id, true );
-                }
+                wp_update_attachment_metadata( $attachment_id, $metadata );
 
                 return $attachment_id;
         }

src/wp-includes/js/media-views.js

@@ -953 +953 @@
                         }) );
                 }
 
+                this.get('library').on( 'add', this._filterContext, this );
+
                 this.resetDisplays();
         },
 
@@ -1152 +1154 @@
                 if ( view && view.get( mode ) ) {
                         setUserSetting( 'libraryContent', mode );
                 }
+        },
+
+        /**
+         * Filter out contextually created attachments (e.g. headers, logos, etc.)
+         *
+         * @since 4.9.0
+         */
+        _filterContext: function() {
+                var library = this.get('library');
+
+                library.set( library.filter( function( item ) {
+                        return item.get('context') === '';
+                } ) );
         }
 });
 

src/wp-includes/js/media/controllers/library.js

@@ -85 +85 @@
                         }) );
                 }
 
+                this.get('library').on( 'add', this._filterContext, this );
+
                 this.resetDisplays();
         },
 
@@ -284 +286 @@
                 if ( view && view.get( mode ) ) {
                         setUserSetting( 'libraryContent', mode );
                 }
+        },
+
+        /**
+         * Filter out contextually created attachments (e.g. headers, logos, etc.)
+         *
+         * @since 4.9.0
+         */
+        _filterContext: function() {
+                var library = this.get('library');
+
+                library.set( library.filter( function( item ) {
+                        return item.get('context') === '';
+                } ) );
         }
 });
 

src/wp-includes/media.php

@@ -3159 +3159 @@
                 $response['filesizeHumanReadable'] = size_format( $bytes );
         }
 
+        $context = get_post_meta( $attachment->ID, '_wp_attachment_context', true );
+        $response['context'] = ( $context ) ? $context : '';
+
         if ( current_user_can( 'edit_post', $attachment->ID ) ) {
                 $response['nonces']['update'] = wp_create_nonce( 'update-post_' . $attachment->ID );
                 $response['nonces']['edit'] = wp_create_nonce( 'image_editor-' . $attachment->ID );

src/wp-includes/theme.php

@@ -1214 +1214 @@
                 $header_images[$header_index]['url'] =  $url;
                 $header_images[$header_index]['thumbnail_url'] = $url;
                 $header_images[$header_index]['alt_text'] = get_post_meta( $header->ID, '_wp_attachment_image_alt', true );
-                $header_images[$header_index]['attachment_parent'] = (int) get_post_meta( $header->ID, '_wp_attachment_parent', true );
+                $header_images[$header_index]['attachment_parent'] = isset( $header_data['attachment_parent'] ) ? $header_data['attachment_parent'] : '';
 
                 if ( isset( $header_data['width'] ) )
                         $header_images[$header_index]['width'] = $header_data['width'];