Changeset 12351

Timestamp:

12/10/2009 06:14:36 AM (15 years ago)

Author:

markjaquith

Message:

Post/Page Image was too generic a name. Post/Page Thumbnail is more clear, even if you can create very large thumbnail images if you so choose.

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (2 diffs)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-page-form.php (modified) (1 diff)
• wp-admin/includes/image.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-admin/includes/post.php (modified) (2 diffs)
• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/media.php (modified) (4 diffs)
• wp-includes/post-image-template.php (deleted)
• wp-includes/post-thumbnail-template.php (added)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/theme.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/admin-ajax.php

@@ -1411 +1411 @@
     if ( $thumbnail_id == '-1' ) {
         delete_post_meta( $post_id, '_thumbnail_id' );
-        die( _wp_post_image_html() );
+        die( _wp_post_thumbnail_html() );
     }
 
@@ -1418 +1418 @@
         if ( !empty( $thumbnail_html ) ) {
             update_post_meta( $post_id, '_thumbnail_id', $thumbnail_id );
-            die( _wp_post_image_html( $thumbnail_id ) );
+            die( _wp_post_thumbnail_html( $thumbnail_id ) );
         }
     }

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', 'post' ) )
-    add_meta_box('postimagediv', __('Post Image'), 'post_image_meta_box', 'post', 'side', 'low');
+if ( current_theme_supports( 'post-thumbnails', 'post' ) )
+    add_meta_box('postimagediv', __('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');

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', 'page' ) )
-    add_meta_box('postimagediv', __('Page Image'), 'post_image_meta_box', 'page', 'side', 'low');
+if ( current_theme_supports( 'post-thumbnails', 'page' ) )
+    add_meta_box('postimagediv', __('Page Image'), 'post_thumbnail_meta_box', 'page', 'side', 'low');
 
 $authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM

trunk/wp-admin/includes/image.php

@@ -76 +76 @@
 
 /**
- * Generate post image attachment meta data.
+ * Generate post thumbnail attachment meta data.
  *
  * @since 2.1.0

trunk/wp-admin/includes/media.php

@@ -1240 +1240 @@
 
     $thumbnail = '';
-    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>";
+    if ( 'image' == $type && isset($_GET['post_id']) && current_theme_supports( 'post-thumbnails', get_post_type($_GET['post_id']) ) && get_post_thumbnail_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']) )

trunk/wp-admin/includes/meta-boxes.php

@@ -816 +816 @@
 
 /**
- * Display post image meta box.
+ * Display post thumbnail meta box.
  *
  * @since 2.9.0
  */
-function post_image_meta_box() {
+function post_thumbnail_meta_box() {
     global $post;
     $thumbnail_id = get_post_meta( $post->ID, '_thumbnail_id', true );
-    echo _wp_post_image_html( $thumbnail_id );
-}
+    echo _wp_post_thumbnail_html( $thumbnail_id );
+}

trunk/wp-admin/includes/post.php

@@ -1063 +1063 @@
 
 /**
- * Output HTML for the post image meta-box.
+ * Output HTML for the post thumbnail meta-box.
  *
  * @since 2.9.0
@@ -1070 +1070 @@
  * @return string html
  */
-function _wp_post_image_html( $thumbnail_id = NULL ) {
+function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
     global $content_width, $_wp_additional_image_sizes;
-    $content = '<p class="hide-if-no-js"><a href="#" id="set-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . esc_html__( 'Set image' ) . '</a></p>';
+    $content = '<p class="hide-if-no-js"><a href="#" id="set-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . esc_html__( 'Set thumbnail' ) . '</a></p>';
 
     if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
         $old_content_width = $content_width;
         $content_width = 266;
-        if ( !isset( $_wp_additional_image_sizes['post-image'] ) )
+        if ( !isset( $_wp_additional_image_sizes['post-thumbnail'] ) )
             $thumbnail_html = wp_get_attachment_image( $thumbnail_id, array( $content_width, $content_width ) );
         else
-            $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-image' );
+            $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
         if ( !empty( $thumbnail_html ) ) {
             $content = '<a href="#" id="set-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . $thumbnail_html . '</a>';
-            $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail();return false;">' . esc_html__( 'Remove image' ) . '</a></p>';
+            $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail();return false;">' . esc_html__( 'Remove thumbnail' ) . '</a></p>';
         }
         $content_width = $old_content_width;
     }
 
-    return apply_filters( 'admin_post_image_html', $content );
+    return apply_filters( 'admin_post_thumbnail_html', $content );
 }
 

trunk/wp-includes/default-filters.php

@@ -214 +214 @@
 add_action( 'wp_scheduled_delete',        'wp_scheduled_delete' );
 
-// Post Image CSS class filtering
-add_action( 'begin_fetch_post_image_html', '_wp_post_image_class_filter_add'    );
-add_action( 'end_fetch_post_image_html',   '_wp_post_image_class_filter_remove' );
+// Post Thumbnail CSS class filtering
+add_action( 'begin_fetch_post_thumbnail_html', '_wp_post_thumbnail_class_filter_add'    );
+add_action( 'end_fetch_post_thumbnail_html',   '_wp_post_thumbnail_class_filter_remove' );
 
 // Redirect Old Slugs

trunk/wp-includes/media.php

@@ -184 +184 @@
 
 /**
- * Registers an image size for the post image
- */
-function set_post_image_size( $width = 0, $height = 0, $crop = FALSE ) {
-    add_image_size( 'post-image', $width, $height, $crop );
+ * Registers an image size for the post thumbnail
+ */
+function set_post_thumbnail_size( $width = 0, $height = 0, $crop = FALSE ) {
+    add_image_size( 'post-thumbnail', $width, $height, $crop );
 }
 
@@ -579 +579 @@
 
 /**
- * Adds a 'wp-post-image' class to post image thumbnails
- * Uses the begin_fetch_post_image_html and end_fetch_post_image_html action hooks to
- * dynamically add/remove itself so as to only filter post image thumbnails
+ * Adds a 'wp-post-image' class to post thumbnail thumbnails
+ * Uses the begin_fetch_post_thumbnail_html and end_fetch_post_thumbnail_html action hooks to
+ * dynamically add/remove itself so as to only filter post thumbnail thumbnails
  *
  * @author Mark Jaquith
@@ -588 +588 @@
  * @return array
  */
-function _wp_post_image_class_filter( $attr ) {
+function _wp_post_thumbnail_class_filter( $attr ) {
     $attr['class'] .= ' wp-post-image';
     return $attr;
@@ -594 +594 @@
 
 /**
- * Adds _wp_post_image_class_filter to the wp_get_attachment_image_attributes filter
+ * Adds _wp_post_thumbnail_class_filter to the wp_get_attachment_image_attributes filter
  *
  * @author Mark Jaquith
  * @since 2.9.0
  */
-function _wp_post_image_class_filter_add( $attr ) {
-    add_filter( 'wp_get_attachment_image_attributes', '_wp_post_image_class_filter' );
-}
-
-/**
- * Removes _wp_post_image_class_filter from the wp_get_attachment_image_attributes filter
+function _wp_post_thumbnail_class_filter_add( $attr ) {
+    add_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
+}
+
+/**
+ * Removes _wp_post_thumbnail_class_filter from the wp_get_attachment_image_attributes filter
  *
  * @author Mark Jaquith
  * @since 2.9.0
  */
-function _wp_post_image_class_filter_remove( $attr ) {
-    remove_filter( 'wp_get_attachment_image_attributes', '_wp_post_image_class_filter' );
+function _wp_post_thumbnail_class_filter_remove( $attr ) {
+    remove_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
 }
 

trunk/wp-includes/script-loader.php

@@ -386 +386 @@
         $scripts->add_data( 'set-post-thumbnail', 'group', 1 );
         $scripts->localize( 'set-post-thumbnail', 'setPostThumbnailL10n', array(
-            'setThumbnail' => __( 'Use as post image' ),
+            'setThumbnail' => __( 'Use as thumbnail' ),
             'saving' => __( 'Saving...' ),
             'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' )

trunk/wp-includes/theme.php

@@ -1322 +1322 @@
     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';
-
     if ( func_num_args() == 1 )
         $_wp_theme_features[$feature] = true;
@@ -1354 +1351 @@
     // @todo Allow pluggable arg checking
     switch ( $feature ) {
-        case 'post-images':
+        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

trunk/wp-settings.php

@@ -693 +693 @@
 
 // Load in support for template functions which the theme supports
-require_if_theme_supports( 'post-images', ABSPATH . WPINC . '/post-image-template.php' );
+require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );
 
 /**