Changeset 22386

Timestamp:

11/05/2012 11:11:25 PM (13 years ago)

Author:

nacin

Message:

Add a $public_only argument to count_many_users_posts() and get_posts_by_author_sql(). Defaults to false, and allows the counts to be returned for only public posts. props ryan, westi. fixes #21431.

Location:

trunk/wp-includes

Files:

• post.php (modified) (2 diffs)
• user.php (modified) (2 diffs)

trunk/wp-includes/post.php

@@ -4432 +4432 @@
  * @param bool $full Optional. Returns a full WHERE statement instead of just an 'andalso' term.
  * @param int $post_author Optional. Query posts having a single author ID.
+ * @param bool $public_only Optional. Only return public posts. Skips cap checks for $current_user.  Default is 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 ) {
+function get_posts_by_author_sql( $post_type, $full = true, $post_author = null, $public_only = false ) {
     global $user_ID, $wpdb;
 
@@ -4458 +4459 @@
     $sql .= "(post_status = 'publish'";
 
-    if ( current_user_can( $cap ) ) {
-        // Does the user have the capability to view private posts? Guess so.
-        $sql .= " OR post_status = 'private'";
-    } elseif ( is_user_logged_in() ) {
-        // Users can view their own private posts.
-        $id = (int) $user_ID;
-        if ( null === $post_author || ! $full ) {
-            $sql .= " OR post_status = 'private' AND post_author = $id";
-        } elseif ( $id == (int) $post_author ) {
+    // Only need to check the cap if $public_only is false
+    if ( false === $public_only ) {
+        if ( current_user_can( $cap ) ) {
+            // Does the user have the capability to view private posts? Guess so.
             $sql .= " OR post_status = 'private'";
+        } elseif ( is_user_logged_in() ) {
+            // Users can view their own private posts.
+            $id = (int) $user_ID;
+            if ( null === $post_author || ! $full ) {
+                $sql .= " OR post_status = 'private' AND post_author = $id";
+            } elseif ( $id == (int) $post_author ) {
+                $sql .= " OR post_status = 'private'";
+            } // else none
         } // else none
-    } // else none
+    }
 
     $sql .= ')';

trunk/wp-includes/user.php

@@ -167 +167 @@
  * @param array $users Array of user IDs.
  * @param string $post_type Optional. Post type to check. Defaults to post.
+ * @param bool $public_only Optional. Only return counts for public posts.  Defaults to false.
  * @return array Amount of posts each user has written.
  */
-function count_many_users_posts( $users, $post_type = 'post' ) {
+function count_many_users_posts( $users, $post_type = 'post', $public_only = false ) {
     global $wpdb;
 
@@ -177 +178 @@
 
     $userlist = implode( ',', array_map( 'absint', $users ) );
-    $where = get_posts_by_author_sql( $post_type );
+    $where = get_posts_by_author_sql( $post_type, true, null, $public_only );
 
     $result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N );