Changeset 31653 for trunk/src/wp-includes/post.php

Timestamp:

03/07/2015 01:14:31 AM (12 years ago)

Author:

boonebgorges

Message:

When passing $full to get_posts_by_author_sql(), make sure a 'post_type' clause is included in results.

This change makes the 'post_type' clause in wp_list_authors() redundant, so
we remove it. Third-party plugins using get_posts_by_author_sql() may have
similarly redundant clauses, but this won't change the results returned by the
SQL queries.

Also adds unit tests for get_posts_by_author_sql().

Props pbearne.
Fixes #30354.

File:

• trunk/src/wp-includes/post.php (modified) (1 diff)

trunk/src/wp-includes/post.php

@@ -5345 +5345 @@
         }
 
-        if ( $full ) {
-                if ( null === $post_author ) {
-                        $sql = $wpdb->prepare( 'WHERE post_type = %s AND ', $post_type );
-                } else {
-                        $sql = $wpdb->prepare( 'WHERE post_author = %d AND post_type = %s AND ', $post_author, $post_type );
-                }
-        } else {
-                $sql = '';
-        }
-
-        $sql .= "(post_status = 'publish'";
+        $sql = $wpdb->prepare( 'post_type = %s', $post_type );
+
+        if ( null !== $post_author ) {
+                $sql .= $wpdb->prepare( ' AND post_author = %d', $post_author );
+        }
 
         // Only need to check the cap if $public_only is false.
+        $post_status_sql = "post_status = 'publish'";
         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'";
+                        $post_status_sql .= " OR post_status = 'private'";
                 } elseif ( is_user_logged_in() ) {
                         // Users can view their own private posts.
                         $id = get_current_user_id();
                         if ( null === $post_author || ! $full ) {
-                                $sql .= " OR post_status = 'private' AND post_author = $id";
+                                $post_status_sql .= " OR post_status = 'private' AND post_author = $id";
                         } elseif ( $id == (int) $post_author ) {
-                                $sql .= " OR post_status = 'private'";
+                                $post_status_sql .= " OR post_status = 'private'";
                         } // else none
                 } // else none
         }
 
-        $sql .= ')';
+        $sql .= " AND ($post_status_sql)";
+
+        if ( $full ) {
+                $sql = 'WHERE ' . $sql;
+        }
 
         return $sql;