Ticket #33216: #33216

From 8e94268c1ea99aaf36b59a405ca186e9ed361edd Mon Sep 17 00:00:00 2001
From: Phil Banks <phil@helpfultechnology.com>
Date: Fri, 31 Jul 2015 12:34:22 +0100
Subject: [PATCH] Show true post count on users screen

Include draft posts in count of users' posts on users.php
---
 wp-admin/includes/class-wp-users-list-table.php |  2 +-
 wp-includes/post.php                            |  6 +++++-
 wp-includes/user.php                            | 12 +++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/wp-admin/includes/class-wp-users-list-table.php b/wp-admin/includes/class-wp-users-list-table.php
index 4035c58..472c97d 100644
--- a/wp-admin/includes/class-wp-users-list-table.php
+++ b/wp-admin/includes/class-wp-users-list-table.php
@@ -311,7 +311,7 @@ class WP_Users_List_Table extends WP_List_Table {
        public function display_rows() {
                // Query the post counts for this page
                if ( ! $this->is_site_users )
-                       $post_counts = count_many_users_posts( array_keys( $this->items ) );
+                       $post_counts = count_many_users_posts( array_keys( $this->items ), 'post', false, true );
 
                $editable_roles = array_keys( get_editable_roles() );
 
diff --git a/wp-includes/post.php b/wp-includes/post.php
index ff332e2..26b16e1 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -5415,9 +5415,10 @@ function get_private_posts_cap_sql( $post_type ) {
  * @param int            $post_author Optional. Query posts having a single author ID. Default null.
  * @param bool           $public_only Optional. Only return public posts. Skips cap checks for
  *                                    $current_user.  Default false.
+ * @param bool           $drafts         Optional. Include draft posts. Default false.
  * @return string SQL WHERE code that can be added to a query.
  */
-function get_posts_by_author_sql( $post_type, $full = true, $post_author = null, $public_only = false ) {
+function get_posts_by_author_sql( $post_type, $full = true, $post_author = null, $public_only = false, $drafts = false ) {
        global $wpdb;
 
        if ( is_array( $post_type ) ) {
@@ -5448,6 +5449,9 @@ function get_posts_by_author_sql( $post_type, $full = true, $post_author = null,
 
                // Only need to check the cap if $public_only is false.
                $post_status_sql = "post_status = 'publish'";
+               if( $drafts ) {
+                       $post_status_sql .= " OR post_status = 'draft'";
+               }
                if ( false === $public_only ) {
                        if ( $cap ) {
                                // Does the user have the capability to view private posts? Guess so.
diff --git a/wp-includes/user.php b/wp-includes/user.php
index 54b09ff..572667c 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -263,12 +263,13 @@ function wp_validate_logged_in_cookie( $user_id ) {
  * @param int          $userid      User ID.
  * @param array|string $post_type   Optional. Post type(s) to count the number of posts for. Default 'post'.
  * @param bool         $public_only Optional. Whether to only return counts for public posts. Default false.
- * @return int Number of posts the user has written in this post type.
+ * @param bool         $drafts                 Optional. Include draft posts. Default false.
+* @return int Number of posts the user has written in this post type.
  */
-function count_user_posts( $userid, $post_type = 'post', $public_only = false ) {
+function count_user_posts( $userid, $post_type = 'post', $public_only = false, $drafts = false ) {
        global $wpdb;
 
-       $where = get_posts_by_author_sql( $post_type, true, $userid, $public_only );
+       $where = get_posts_by_author_sql( $post_type, true, $userid, $public_only, $drafts );
 
        $count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
 
@@ -297,9 +298,10 @@ function count_user_posts( $userid, $post_type = 'post', $public_only = false )
  * @param array        $users       Array of user IDs.
  * @param string|array $post_type   Optional. Single post type or array of post types to check. Defaults to 'post'.
  * @param bool         $public_only Optional. Only return counts for public posts.  Defaults to false.
+ * @param bool         $drafts                 Optional. Include draft posts. Default false.
  * @return array Amount of posts each user has written.
  */
-function count_many_users_posts( $users, $post_type = 'post', $public_only = false ) {
+function count_many_users_posts( $users, $post_type = 'post', $public_only = false, $drafts = false ) {
        global $wpdb;
 
        $count = array();
@@ -307,7 +309,7 @@ function count_many_users_posts( $users, $post_type = 'post', $public_only = fal
                return $count;
 
        $userlist = implode( ',', array_map( 'absint', $users ) );
-       $where = get_posts_by_author_sql( $post_type, true, null, $public_only );
+       $where = get_posts_by_author_sql( $post_type, true, null, $public_only, $drafts );
 
        $result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N );
        foreach ( $result as $row ) {
-- 
2.2.1