Changeset 28051

Timestamp:

04/08/2014 05:39:58 PM (11 years ago)

Author:

nacin

Message:

Don't show featured images for image attachments. Remove abstractions for now.

fixes #27673.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (2 diffs)
• wp-includes/media.php (modified) (2 diffs)

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

@@ -25 +25 @@
 $action = isset($action) ? $action : '';
 
-$media_support = theme_supports_thumbnails( $post ) || post_supports_thumbnails( $post );
-
-if ( post_type_supports( $post_type, 'editor' ) || post_type_supports( $post_type, 'thumbnail' ) || $media_support ) {
+$thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' );
+if ( ! $thumbnail_support && 'attachment' === $post_type && $post->post_mime_type ) {
+    if ( 0 === strpos( $post->post_mime_type, 'audio/' ) ) {
+        $thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
+    } elseif ( 0 === strpos( $post->post_mime_type, 'video/' ) ) {
+        $thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+    }
+}
+
+if ( $thumbnail_support ) {
     add_thickbox();
     wp_enqueue_media( array( 'post' => $post_ID ) );
@@ -170 +177 @@
     add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
 
-if ( current_theme_supports( 'post-thumbnails', $post_type ) || post_supports_thumbnails( $post ) )
+if ( $thumbnail_support )
     add_meta_box('postimagediv', __('Featured Image'), 'post_thumbnail_meta_box', null, 'side', 'low');
 

trunk/src/wp-includes/media.php

@@ -2453 +2453 @@
         );
 
-        if ( theme_supports_thumbnails( $post ) || post_supports_thumbnails( $post ) ) {
+        $thumbnail_support = current_theme_supports( 'post-thumbnails', $post->post_type ) && post_type_supports( $post->post_type, 'thumbnail' );
+        if ( ! $thumbnail_support && 'attachment' === $post->post_type && $post->post_mime_type ) {
+            if ( 0 === strpos( $post->post_mime_type, 'audio/' ) ) {
+                $thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
+            } elseif ( 0 === strpos( $post->post_mime_type, 'video/' ) ) {
+                $thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+            }
+        }
+
+        if ( $thumbnail_support ) {
             $featured_image_id = get_post_meta( $post->ID, '_thumbnail_id', true );
             $settings['post']['featuredImageId'] = $featured_image_id ? $featured_image_id : -1;
@@ -2757 +2766 @@
     }
 }
-
-/**
- * Determine if a post supports thumbnails based on the passed post object.
- *
- * @since 3.9.0
- *
- * @param WP_Post $post Post object.
- *
- * @return bool Whether the post type supports thumbnails.
- */
-function post_supports_thumbnails( $post ) {
-    if ( 'attachment' === $post->post_type ) {
-        if ( 0 === strpos( $post->post_mime_type, 'audio' ) ) {
-            return post_type_supports( 'attachment:audio', 'thumbnail' );
-        } elseif ( 0 === strpos( $post->post_mime_type, 'video' ) ) {
-            return post_type_supports( 'attachment:video', 'thumbnail' );
-        }
-    }
-
-    return post_type_supports( $post->post_type, 'thumbnail' );
-}
-
-/**
- * Determine if a theme supports thumbnails based on the passed post object.
- *
- * @since 3.9.0
- *
- * @param WP_Post $post Post object.
- *
- * @return bool Whether the current theme supports thumbnails.
- */
-function theme_supports_thumbnails( $post ) {
-    if ( 'attachment' === $post->post_type ) {
-        if ( 0 === strpos( $post->post_mime_type, 'audio' ) ) {
-            return current_theme_supports( 'post-thumbnails', 'attachment:audio' );
-        } elseif ( 0 === strpos( $post->post_mime_type, 'video' ) ) {
-            return current_theme_supports( 'post-thumbnails', 'attachment:video' );
-        }
-    }
-
-    return current_theme_supports( 'post-thumbnails', $post->post_type );
-}