<!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>[15605] trunk/wp-admin/includes/default-list-tables.php:
Fix posts screen for contributors.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15605">15605</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-09-09 22:22:36 +0000 (Thu, 09 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix posts screen for contributors. Fixes <a href="http://trac.wordpress.org/ticket/14822">#14822</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesdefaultlisttablesphp">trunk/wp-admin/includes/default-list-tables.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesdefaultlisttablesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/default-list-tables.php (15604 => 15605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/default-list-tables.php 2010-09-09 20:34:40 UTC (rev 15604)
+++ trunk/wp-admin/includes/default-list-tables.php 2010-09-09 22:22:36 UTC (rev 15605)
</span><span class="lines">@@ -29,8 +29,17 @@
</span><span class="cx"> */
</span><span class="cx"> var $comment_pending_count;
</span><span class="cx">
</span><ins>+ /**
+ * Holds the number of posts for this user
+ *
+ * @since 3.1.0
+ * @var bool
+ * @access private
+ */
+ var $user_posts_count;
+
</ins><span class="cx"> function WP_Posts_Table() {
</span><del>- global $post_type_object, $post_type, $current_screen;
</del><ins>+ global $post_type_object, $post_type, $current_screen, $wpdb;
</ins><span class="cx">
</span><span class="cx"> if ( !isset( $_REQUEST['post_type'] ) )
</span><span class="cx"> $post_type = 'post';
</span><span class="lines">@@ -42,6 +51,17 @@
</span><span class="cx">
</span><span class="cx"> $post_type_object = get_post_type_object( $post_type );
</span><span class="cx">
</span><ins>+ if ( !current_user_can( $post_type_object->cap->edit_others_posts ) ) {
+ $this->user_posts_count = $wpdb->get_var( $wpdb->prepare( "
+ SELECT COUNT( 1 ) FROM $wpdb->posts
+ WHERE post_type = '%s' AND post_status NOT IN ( 'trash', 'auto-draft' )
+ AND post_author = %d
+ ", $post_type, get_current_user_id() ) );
+
+ if ( $this->user_posts_count && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) )
+ $_GET['author'] = get_current_user_id();
+ }
+
</ins><span class="cx"> parent::WP_List_Table( array(
</span><span class="cx"> 'screen' => $current_screen,
</span><span class="cx"> 'plural' => 'posts',
</span><span class="lines">@@ -98,7 +118,7 @@
</span><span class="cx">
</span><span class="cx"> function get_views() {
</span><span class="cx"> global $post_type, $post_type_object, $locked_post_status, $avail_post_stati;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ( !empty($locked_post_status) )
</span><span class="cx"> return array();
</span><span class="cx">
</span><span class="lines">@@ -107,24 +127,12 @@
</span><span class="cx"> $class = '';
</span><span class="cx"> $allposts = '';
</span><span class="cx">
</span><del>- $user_posts = false;
- if ( !current_user_can( $post_type_object->cap->edit_others_posts ) ) {
- $user_posts = true;
</del><ins>+ $current_user_id = get_current_user_id();
</ins><span class="cx">
</span><del>- $user_posts_count = $wpdb->get_var( $wpdb->prepare( "
- SELECT COUNT( 1 ) FROM $wpdb->posts
- WHERE post_type = '%s' AND post_status NOT IN ( 'trash', 'auto-draft' )
- AND post_author = %d
- ", $post_type, get_current_user_id() ) );
-
- if ( $user_posts_count && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) )
- $_REQUEST['author'] = get_current_user_id();
- }
-
- if ( $user_posts ) {
- if ( isset( $_REQUEST['author'] ) && ( $_REQUEST['author'] == $current_user->ID ) )
</del><ins>+ if ( $this->user_posts_count ) {
+ if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) )
</ins><span class="cx"> $class = ' class="current"';
</span><del>- $status_links['author'] = "<li><a href='edit.php?post_type=$post_type&author=$current_user->ID'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $user_posts_count, 'posts' ), number_format_i18n( $user_posts_count ) ) . '</a>';
</del><ins>+ $status_links['mine'] = "<li><a href='edit.php?post_type=$post_type&author=$current_user_id'$class>" . sprintf( _nx( 'Mine <span class="count">(%s)</span>', 'Mine <span class="count">(%s)</span>', $this->user_posts_count, 'posts' ), number_format_i18n( $this->user_posts_count ) ) . '</a>';
</ins><span class="cx"> $allposts = '&all_posts=1';
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>