Ticket #27460: 27460.diff

src/wp-admin/edit-form-advanced.php

@@ -24 +24 @@
 $user_ID = isset($user_ID) ? (int) $user_ID : 0;
 $action = isset($action) ? $action : '';
 
-$media_type = false;
-if ( 'attachment' === $post_type && $post_ID ) {
-        $post = get_post( $post_ID );
-        $media_type = post_supports_thumbnails( $post );
-}
+$media_support = theme_supports_thumbnails( $post ) || post_supports_thumbnails( $post );
 
-if ( post_type_supports( $post_type, 'editor' ) || post_type_supports( $post_type, 'thumbnail' ) || $media_type ) {
+if ( post_type_supports( $post_type, 'editor' ) || post_type_supports( $post_type, 'thumbnail' ) || $media_support ) {
         add_thickbox();
         wp_enqueue_media( array( 'post' => $post_ID ) );
 }
@@ -169 +165 @@
 if ( post_type_supports($post_type, 'page-attributes') )
         add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
 
-$audio_post_support = $video_post_support = false;
-$theme_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' );
-if ( 'attachment' === $post_type && ! empty( $post->post_mime_type ) ) {
-        $audio_post_support = 0 === strpos( $post->post_mime_type, 'audio/' ) && current_theme_supports( 'post-thumbnails', 'attachment:audio' ) && post_type_supports( 'attachment:audio', 'thumbnail' );
-        $video_post_support = 0 === strpos( $post->post_mime_type, 'video/' ) && current_theme_supports( 'post-thumbnails', 'attachment:video' ) && post_type_supports( 'attachment:video', 'thumbnail' );
-}
-
-if ( $theme_support || $audio_post_support || $video_post_support )
+if ( current_theme_supports( 'post-thumbnails', $post_type ) || post_supports_thumbnails( $post ) )
         add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', null, 'side', 'low');
 
 if ( post_type_supports($post_type, 'excerpt') )

src/wp-admin/includes/image.php

@@ -127 +127 @@
 
         } elseif ( preg_match( '#^video/#', get_post_mime_type( $attachment ) ) ) {
                 $metadata = wp_read_video_metadata( $file );
-                $support = current_theme_supports( 'post-thumbnails', 'attachment:video' ) && post_type_supports( 'attachment:video', 'thumbnail' );
+                $support = current_theme_supports( 'post-thumbnails', 'attachment:video' ) || post_type_supports( 'attachment:video', 'thumbnail' );
         } elseif ( preg_match( '#^audio/#', get_post_mime_type( $attachment ) ) ) {
                 $metadata = wp_read_audio_metadata( $file );
-                $support = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) && post_type_supports( 'attachment:audio', 'thumbnail' );
+                $support = current_theme_supports( 'post-thumbnails', 'attachment:audio' ) || post_type_supports( 'attachment:audio', 'thumbnail' );
         }
 
         if ( $support && ! empty( $metadata['image']['data'] ) ) {

src/wp-includes/media.php

@@ -2445 +2445 @@
                         'nonce' => wp_create_nonce( 'update-post_' . $post->ID ),
                 );
 
-                if ( theme_supports_thumbnails( $post ) && post_supports_thumbnails( $post ) ) {
+                if ( theme_supports_thumbnails( $post ) || post_supports_thumbnails( $post ) ) {
                         $featured_image_id = get_post_meta( $post->ID, '_thumbnail_id', true );
                         $settings['post']['featuredImageId'] = $featured_image_id ? $featured_image_id : -1;
                 }

src/wp-includes/post.php

@@ -74 +74 @@
                 'delete_with_user' => true,
                 'supports' => array( 'title', 'author', 'comments' ),
         ) );
+        add_post_type_support( 'attachment:audio', 'thumbnail' );
+        add_post_type_support( 'attachment:video', 'thumbnail' );
 
         register_post_type( 'revision', array(
                 'labels' => array(