<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12343] trunk/wp-admin: More standardization around Post/
Page Image instead of Post/Page Thumbnail</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12343">12343</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2009-12-08 21:24:32 +0000 (Tue, 08 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>More standardization around Post/Page Image instead of Post/Page Thumbnail</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminadminajaxphp">trunk/wp-admin/admin-ajax.php</a></li>
<li><a href="#trunkwpadmineditformadvancedphp">trunk/wp-admin/edit-form-advanced.php</a></li>
<li><a href="#trunkwpadmineditpageformphp">trunk/wp-admin/edit-page-form.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminadminajaxphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/admin-ajax.php (12342 => 12343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/admin-ajax.php 2009-12-08 21:08:19 UTC (rev 12342)
+++ trunk/wp-admin/admin-ajax.php 2009-12-08 21:24:32 UTC (rev 12343)
</span><span class="lines">@@ -1410,14 +1410,14 @@
</span><span class="cx">
</span><span class="cx"> if ( $thumbnail_id == '-1' ) {
</span><span class="cx"> delete_post_meta( $post_id, '_thumbnail_id' );
</span><del>- die( _wp_post_thumbnail_html() );
</del><ins>+ die( _wp_post_image_html() );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
</span><span class="cx"> $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'thumbnail' );
</span><span class="cx"> if ( !empty( $thumbnail_html ) ) {
</span><span class="cx"> update_post_meta( $post_id, '_thumbnail_id', $thumbnail_id );
</span><del>- die( _wp_post_thumbnail_html( $thumbnail_id ) );
</del><ins>+ die( _wp_post_image_html( $thumbnail_id ) );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> die( '0' );
</span></span></pre></div>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (12342 => 12343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2009-12-08 21:08:19 UTC (rev 12342)
+++ trunk/wp-admin/edit-form-advanced.php 2009-12-08 21:24:32 UTC (rev 12343)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
</span><span class="cx"> if ( current_theme_supports( 'post-images' ) )
</span><del>- add_meta_box('postimagediv', __('Post Thumbnail'), 'post_thumbnail_meta_box', 'post', 'side', 'low');
</del><ins>+ add_meta_box('postimagediv', __('Post Image'), 'post_image_meta_box', 'post', 'side', 'low');
</ins><span class="cx"> add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core');
</span><span class="cx"> add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', 'post', 'normal', 'core');
</span><span class="cx"> add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'normal', 'core');
</span></span></pre></div>
<a id="trunkwpadmineditpageformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-page-form.php (12342 => 12343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-page-form.php 2009-12-08 21:08:19 UTC (rev 12342)
+++ trunk/wp-admin/edit-page-form.php 2009-12-08 21:24:32 UTC (rev 12343)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'page', 'normal', 'core');
</span><span class="cx"> add_meta_box('slugdiv', __('Page Slug'), 'post_slug_meta_box', 'page', 'normal', 'core');
</span><span class="cx"> if ( current_theme_supports( 'post-images' ) )
</span><del>- add_meta_box('postimagediv', __('Page Thumbnail'), 'post_thumbnail_meta_box', 'page', 'side', 'low');
</del><ins>+ add_meta_box('postimagediv', __('Page Image'), 'post_image_meta_box', 'page', 'side', 'low');
</ins><span class="cx">
</span><span class="cx"> $authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM
</span><span class="cx"> if ( $post->post_author && !in_array($post->post_author, $authors) )
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (12342 => 12343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2009-12-08 21:08:19 UTC (rev 12342)
+++ trunk/wp-admin/includes/meta-boxes.php 2009-12-08 21:24:32 UTC (rev 12343)
</span><span class="lines">@@ -815,12 +815,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Display post thumbnail meta box.
</del><ins>+ * Display post image meta box.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> */
</span><del>-function post_thumbnail_meta_box() {
</del><ins>+function post_image_meta_box() {
</ins><span class="cx"> global $post;
</span><span class="cx"> $thumbnail_id = get_post_meta( $post->ID, '_thumbnail_id', true );
</span><del>- echo _wp_post_thumbnail_html( $thumbnail_id );
</del><ins>+ echo _wp_post_image_html( $thumbnail_id );
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (12342 => 12343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2009-12-08 21:08:19 UTC (rev 12342)
+++ trunk/wp-admin/includes/post.php 2009-12-08 21:24:32 UTC (rev 12343)
</span><span class="lines">@@ -1062,16 +1062,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Output HTML for the post thumbnail meta-box.
</del><ins>+ * Output HTML for the post image meta-box.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $thumbnail_id ID of the attachment used for thumbnail
</span><span class="cx"> * @return string html
</span><span class="cx"> */
</span><del>-function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
</del><ins>+function _wp_post_image_html( $thumbnail_id = NULL ) {
</ins><span class="cx"> global $content_width, $_wp_additional_image_sizes;
</span><del>- $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>';
</del><ins>+ $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>';
</ins><span class="cx">
</span><span class="cx"> if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
</span><span class="cx"> $old_content_width = $content_width;
</span><span class="lines">@@ -1082,12 +1082,12 @@
</span><span class="cx"> $thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-image' );
</span><span class="cx"> if ( !empty( $thumbnail_html ) ) {
</span><span class="cx"> $content = '<a href="#" id="set-post-thumbnail" onclick="jQuery(\'#add_image\').click();return false;">' . $thumbnail_html . '</a>';
</span><del>- $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail();return false;">' . esc_html__( 'Remove thumbnail' ) . '</a></p>';
</del><ins>+ $content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail();return false;">' . esc_html__( 'Remove image' ) . '</a></p>';
</ins><span class="cx"> }
</span><span class="cx"> $content_width = $old_content_width;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return apply_filters( 'admin_post_thumbnail_html', $content );
</del><ins>+ return apply_filters( 'admin_post_image_html', $content );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre>
</div>
</div>
</body>
</html>