<!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>[12328] trunk/wp-admin: Reverting [12324] and [12322] after some discussion
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12328">12328</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2009-12-07 04:31:44 +0000 (Mon, 07 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reverting <a href="http://trac.wordpress.org/changeset/12324">[12324]</a> and <a href="http://trac.wordpress.org/changeset/12322">[12322]</a> after some discussion.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditformadvancedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-advanced.php (12327 => 12328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-advanced.php 2009-12-06 18:01:01 UTC (rev 12327)
+++ trunk/wp-admin/edit-form-advanced.php 2009-12-07 04:31:44 UTC (rev 12328)
</span><span class="lines">@@ -98,7 +98,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core');
</span><del>-add_meta_box('postthumbnaildiv', __('Post Thumbnail'), 'post_thumbnail_meta_box', 'post', 'side', 'low');
</del><ins>+if ( current_theme_supports( 'post-thumbnails' ) )
+ add_meta_box('postthumbnaildiv', __('Post Thumbnail'), 'post_thumbnail_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 (12327 => 12328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-page-form.php 2009-12-06 18:01:01 UTC (rev 12327)
+++ trunk/wp-admin/edit-page-form.php 2009-12-07 04:31:44 UTC (rev 12328)
</span><span class="lines">@@ -80,7 +80,8 @@
</span><span class="cx"> add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'page', 'normal', 'core');
</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><del>-add_meta_box('postthumbnaildiv', __('Page Thumbnail'), 'post_thumbnail_meta_box', 'page', 'side', 'low');
</del><ins>+if ( current_theme_supports( 'post-thumbnails' ) )
+ add_meta_box('postthumbnaildiv', __('Page Thumbnail'), 'post_thumbnail_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="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (12327 => 12328)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2009-12-06 18:01:01 UTC (rev 12327)
+++ trunk/wp-admin/includes/post.php 2009-12-07 04:31:44 UTC (rev 12328)
</span><span class="lines">@@ -1068,17 +1068,6 @@
</span><span class="cx"> * @return string html
</span><span class="cx"> */
</span><span class="cx"> function _wp_post_thumbnail_html( $thumbnail_id = NULL ) {
</span><del>- global $post;
- if ( !current_theme_supports( 'post-thumbnails' ) ) {
- if ( 'post' == $post->post_type ) {
- $type = __( 'post' );
- } elseif ( 'page' == $post->post_type ) {
- $type = __( 'page' );
- } else {
- $type = $post->post_type;
- }
- return sprintf( __( '<p>Your theme does not currently support <a href="%1$s" target="blank" rel="external">%2$s thumbnails</a>.</p><p>You can hide this module by clicking the "Screen Options" tab.</p>' ), _x( 'http://codex.wordpress.org/Post_Images', 'Within the post/page thumbnail module on the post/page edit screen' ), $type );
- }
</del><span class="cx"> $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>';
</span><span class="cx">
</span><span class="cx"> if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
</span></span></pre>
</div>
</div>
</body>
</html>