Changeset 12350

Timestamp:

12/09/2009 03:39:20 PM (15 years ago)

Author:

ryan

Message:

Allow registering post image support per post type. fixes #11364

Location:

trunk

Files:

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

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

@@ -99 +99 @@
 
 add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
-if ( current_theme_supports( 'post-images' ) )
+if ( current_theme_supports( 'post-images', 'post' ) )
     add_meta_box('postimagediv', __('Post Image'), 'post_image_meta_box', 'post', 'side', 'low');
 add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core');

trunk/wp-admin/edit-page-form.php

@@ -81 +81 @@
 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-images' ) )
+if ( current_theme_supports( 'post-images', 'page' ) )
     add_meta_box('postimagediv', __('Page Image'), 'post_image_meta_box', 'page', 'side', 'low');
 

trunk/wp-admin/includes/media.php

@@ -1240 +1240 @@
 
     $thumbnail = '';
-    if ( 'image' == $type && current_theme_supports( 'post-images' ) && get_post_image_id($_GET['post_id']) != $attachment_id )
+    if ( 'image' == $type && isset($_GET['post_id']) && current_theme_supports( 'post-images', get_post_type($_GET['post_id']) ) && 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 post image" ) . "</a>";
 

trunk/wp-includes/theme.php

@@ -1321 +1321 @@
 function add_theme_support( $feature ) {
     global $_wp_theme_features;
+
     if ( 'post-thumbnails' == $feature ) // This was changed during 2.9 beta. I'll be nice and not break things.
         $feature = 'post-images';
-    $_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 );
 }
 
@@ -1337 +1342 @@
 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-images':
+            // 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;
 }