Ticket #11364: 11364.diff

wp-includes/theme.php

@@ -1320 +1320 @@
  */
 function add_theme_support( $feature ) {
         global $_wp_theme_features;
-        $_wp_theme_features[$feature] = true;
+
+        if ( func_num_args() == 1 )
+                $_wp_theme_features[$feature] = true;
+        else
+                $_wp_theme_features[$feature] = array_slice( func_get_args(), 1 );
 }
 
 /**
@@ -1334 +1338 @@
 
 function current_theme_supports( $feature ) {
         global $_wp_theme_features;
-        return ( isset( $_wp_theme_features[$feature] ) && $_wp_theme_features[$feature] );
+
+        if ( !isset( $_wp_theme_features[$feature] ) )
+                return false;
+
+        // If no args passed then no extra checks need be performed
+        if ( func_num_args() <= 1 )
+                return true;
+
+        $args = array_slice( func_get_args(), 1 );
+
+        // @todo Allow pluggable arg checking
+        switch ( $feature ) {
+                case 'post-thumbnails':
+                        // post-thumbnails can be registered for only certain content/post types by passing
+                        // an array of types to add_theme_support().  If no array was passed, then
+                        // any type is accepted
+                        if ( true === $_wp_theme_features[$feature] )  // Registered for all types
+                                return true;
+                        $content_type = $args[0];
+                        if ( in_array($content_type, $_wp_theme_features[$feature][0]) )
+                                return true;
+                        else
+                                return false;
+                        break;
+        }
+
+        return true;
 }
 
 /**

wp-admin/includes/media.php

@@ -1239 +1239 @@
         }
 
         $thumbnail = '';
-        if ( 'image' == $type && current_theme_supports( 'post-thumbnails' ) && get_post_image_id($_GET['post_id']) != $attachment_id )
+        if ( 'image' == $type && current_theme_supports( 'post-thumbnails', 'attachment:image' ) && get_post_image_id($_GET['post_id']) != $attachment_id )
                 $thumbnail = "<a class='wp-post-thumbnail' href='#' onclick='WPSetAsThumbnail(\"$attachment_id\");return false;'>" . esc_html__( "Use as thumbnail" ) . "</a>";
 
         if ( ( $send || $thumbnail || $delete ) && !isset($form_fields['buttons']) )

wp-admin/edit-page-form.php

@@ -80 +80 @@
 add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'page', 'normal', 'core');
 add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'page', 'normal', 'core');
 add_meta_box('slugdiv', __('Page Slug'), 'post_slug_meta_box', 'page', 'normal', 'core');
-if ( current_theme_supports( 'post-thumbnails' ) )
+if ( current_theme_supports( 'post-thumbnails', 'page' ) )
         add_meta_box('postthumbnaildiv', __('Page Thumbnail'), 'post_thumbnail_meta_box', 'page', 'side', 'low');
 
 $authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM

wp-admin/edit-form-advanced.php

@@ -98 +98 @@
 }
 
 add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
-if ( current_theme_supports( 'post-thumbnails' ) )
+if ( current_theme_supports( 'post-thumbnails', 'post' ) )
         add_meta_box('postthumbnaildiv', __('Post Thumbnail'), 'post_thumbnail_meta_box', 'post', 'side', 'low');
 add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core');
 add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', 'post', 'normal', 'core');