Changeset 21585

Timestamp:

08/22/2012 06:24:23 PM (13 years ago)

Author:

ryan

Message:

Use get_posts() to fetch stickies rather than custom bare SQL. Props scribu. see #21309

File:

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

trunk/wp-includes/query.php

@@ -2734 +2734 @@
             // Fetch sticky posts that weren't in the query results
             if ( !empty($sticky_posts) ) {
-                $stickies__in = implode(',', array_map( 'absint', $sticky_posts ));
-                // honor post type(s) if not set to any
-                $stickies_where = '';
-                if ( 'any' != $post_type && '' != $post_type ) {
-                    if ( is_array( $post_type ) ) {
-                        $post_types = join( "', '", $post_type );
-                    } else {
-                        $post_types = $post_type;
-                    }
-                    $stickies_where = "AND $wpdb->posts.post_type IN ('" . $post_types . "')";
-                }
-
-                $stickies = $wpdb->get_results( "SELECT * FROM $wpdb->posts WHERE $wpdb->posts.ID IN ($stickies__in) $stickies_where" );
+                $stickies = get_posts( array(
+                    'post__in' => $sticky_posts,
+                    'post_type' => $post_type,
+                    'post_status' => 'publish',
+                    'nopaging' => true
+                ) );
+
                 foreach ( $stickies as $sticky_post ) {
-                    // Ignore sticky posts the current user cannot read or are not published.
-                    if ( 'publish' != $sticky_post->post_status )
-                        continue;
-                    array_splice($this->posts, $sticky_offset, 0, array( get_post( $sticky_post ) ) );
+                    array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );
                     $sticky_offset++;
                 }