<!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>[16680] trunk/wp-admin/includes: Revert [15742].</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16680">16680</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-12-02 03:39:26 +0000 (Thu, 02 Dec 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Revert <a href="http://trac.wordpress.org/changeset/15742">[15742]</a>. Custom post types and sticky posts don't mix. fixes <a href="http://trac.wordpress.org/ticket/12702">#12702</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswppostslisttablephp">trunk/wp-admin/includes/class-wp-posts-list-table.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswppostslisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-posts-list-table.php (16679 => 16680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-posts-list-table.php 2010-12-02 03:19:14 UTC (rev 16679)
+++ trunk/wp-admin/includes/class-wp-posts-list-table.php 2010-12-02 03:39:26 UTC (rev 16680)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> $_GET['author'] = get_current_user_id();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $sticky_posts = get_option( 'sticky_posts' ) ) {
</del><ins>+ if ( 'post' == $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
</ins><span class="cx"> $sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
</span><span class="cx"> $this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND ID IN ($sticky_posts)", $post_type ) );
</span><span class="cx"> }
</span><span class="lines">@@ -950,7 +950,7 @@
</span><span class="cx"> </select>
</span><span class="cx"> </label>
</span><span class="cx">
</span><del>- <?php if ( post_type_supports( $screen->post_type, 'sticky' ) && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
</del><ins>+ <?php if ( 'post' == $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( $bulk ) : ?>
</span><span class="cx">
</span><span class="lines">@@ -967,12 +967,12 @@
</span><span class="cx">
</span><span class="cx"> <label class="alignleft">
</span><span class="cx"> <input type="checkbox" name="sticky" value="sticky" />
</span><del>- <span class="checkbox-title"><?php _e( 'Make this sticky' ); ?></span>
</del><ins>+ <span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
</ins><span class="cx"> </label>
</span><span class="cx">
</span><span class="cx"> <?php endif; // $bulk ?>
</span><span class="cx">
</span><del>- <?php endif; // post_type_supports(sticky) && $can_publish && current_user_can( 'edit_others_cap' ) ?>
</del><ins>+ <?php endif; // 'post' && $can_publish && current_user_can( 'edit_others_cap' ) ?>
</ins><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (16679 => 16680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-12-02 03:19:14 UTC (rev 16679)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-12-02 03:39:26 UTC (rev 16680)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> } elseif ( !empty( $post->post_password ) ) {
</span><span class="cx"> $visibility = 'password';
</span><span class="cx"> $visibility_trans = __('Password protected');
</span><del>-} elseif ( post_type_supports( $post->post_type, 'sticky' ) && is_sticky( $post->ID ) ) {
</del><ins>+} elseif ( $post_type == 'post' && is_sticky( $post->ID ) ) {
</ins><span class="cx"> $visibility = 'public';
</span><span class="cx"> $visibility_trans = __('Public, Sticky');
</span><span class="cx"> } else {
</span><span class="lines">@@ -128,15 +128,15 @@
</span><span class="cx">
</span><span class="cx"> <div id="post-visibility-select" class="hide-if-js">
</span><span class="cx"> <input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr($post->post_password); ?>" />
</span><del>-<?php if ( post_type_supports( $post->post_type, 'sticky' ) ): ?>
</del><ins>+<?php if ($post_type == 'post'): ?>
</ins><span class="cx"> <input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID)); ?> />
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $visibility ); ?>" />
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> <input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br />
</span><del>-<?php if ( post_type_supports( $post->post_type, 'sticky' ) ): ?>
-<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID)); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick this to the front page') ?></label><br /></span>
</del><ins>+<?php if ($post_type == 'post'): ?>
+<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID)); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick this post to the front page') ?></label><br /></span>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx"> <input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br />
</span><span class="cx"> <span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr($post->post_password); ?>" /><br /></span>
</span></span></pre>
</div>
</div>
</body>
</html>