Changeset 12343

Timestamp:

12/08/2009 09:24:32 PM (15 years ago)

Author:

markjaquith

Message:

More standardization around Post/Page Image instead of Post/Page Thumbnail

Location:

trunk/wp-admin

Files:

• admin-ajax.php (modified) (2 diffs)
• edit-form-advanced.php (modified) (1 diff)
• edit-page-form.php (modified) (1 diff)
• includes/meta-boxes.php (modified) (1 diff)
• includes/post.php (modified) (3 diffs)

trunk/wp-admin/admin-ajax.php

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

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

@@ -100 +100 @@
 add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
 if ( current_theme_supports( 'post-images' ) )
-    add_meta_box('postimagediv', __('Post Thumbnail'), 'post_thumbnail_meta_box', 'post', 'side', 'low');
+    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');
 add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', 'post', 'normal', 'core');

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

@@ -82 +82 @@
 add_meta_box('slugdiv', __('Page Slug'), 'post_slug_meta_box', 'page', 'normal', 'core');
 if ( current_theme_supports( 'post-images' ) )
-    add_meta_box('postimagediv', __('Page Thumbnail'), 'post_thumbnail_meta_box', 'page', 'side', 'low');
+    add_meta_box('postimagediv', __('Page Image'), 'post_image_meta_box', 'page', 'side', 'low');
 
 $authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM

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

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

trunk/wp-admin/includes/post.php

@@ -1063 +1063 @@
 
 /**
- * Output HTML for the post thumbnail meta-box.
+ * Output HTML for the post image meta-box.
  *
  * @since 2.9.0
@@ -1070 +1070 @@
  * @return string html
  */
-function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
+function _wp_post_image_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 thumbnail' ) . '</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 image' ) . '</a></p>';
 
     if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
@@ -1083 +1083 @@
         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 thumbnail' ) . '</a></p>';
+            $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail();return false;">' . esc_html__( 'Remove image' ) . '</a></p>';
         }
         $content_width = $old_content_width;
     }
 
-    return apply_filters( 'admin_post_thumbnail_html', $content );
+    return apply_filters( 'admin_post_image_html', $content );
 }