Ticket #12960: 12960.3.diff

src/wp-admin/includes/class-wp-users-list-table.php

@@ -387 +387 @@
          * Generate the list table rows.
          *
          * @since 3.1.0
+         * @since 5.5.0 Include 'pending', 'future', and 'draft' posts in the count.
          */
         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 );
                 }
 
                 foreach ( $this->items as $userid => $user_object ) {

src/wp-includes/post.php

@@ -6371 +6371 @@
  *
  * @since 3.0.0
  * @since 4.3.0 Introduced the ability to pass an array of post types to `$post_type`.
+ * @since 5.5.0 Added the parameter `$include_unpublished` which will include 'pending', 'future', and 'draft'
+ *              posts in the SQL.
  *
  * @see get_private_posts_cap_sql()
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param string|string[] $post_type   Single post type or an array of post types.
- * @param bool            $full        Optional. Returns a full WHERE statement instead of just
- *                                     an 'andalso' term. Default true.
- * @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 string|string[] $post_type           Single post type or an array of post types.
+ * @param bool            $full                Optional. Returns a full WHERE statement instead of just
+ *                                             an 'andalso' term. Default true.
+ * @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            $include_unpublished Optional. Whether to include 'pending', 'future', and '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, $include_unpublished = false ) {
         global $wpdb;
 
         if ( is_array( $post_type ) ) {
@@ -6428 +6432 @@
                                         $post_status_sql .= " OR post_status = 'private'";
                                 } // Else none.
                         } // Else none.
+
+                        if ( $include_unpublished ) {
+                                $post_status_sql .= " OR post_status = 'future' OR post_status = 'pending' OR post_status = 'draft'";
+                        }
                 }
 
                 $post_type_clauses[] = "( post_type = '" . $post_type . "' AND ( $post_status_sql ) )";

src/wp-includes/user.php

@@ -393 +393 @@
  * Number of posts written by a list of users.
  *
  * @since 3.0.0
+ * @since 5.5.0 Added the parameter `$include_unpublished` which will include 'pending', 'future', and 'draft' posts.
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int[]           $users       Array of user IDs.
- * @param string|string[] $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 int[]           $users               Array of user IDs.
+ * @param string|string[] $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            $include_unpublished Optional. Whether to include 'pending', 'future', and 'draft' posts.
+ *                                             Default false.
  * @return string[] Amount of posts each user has written, as strings, keyed by user ID.
  */
-function count_many_users_posts( $users, $post_type = 'post', $public_only = false ) {
+function count_many_users_posts( $users, $post_type = 'post', $public_only = false, $include_unpublished = false ) {
         global $wpdb;
 
         $count = array();
@@ -410 +413 @@
         }
 
         $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, $include_unpublished );
 
         $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 ) {