Ticket #14624: 14624.diff

wp-includes/post.php

@@ -1122 +1122 @@
         } elseif ( ! empty($r['exclude']) )
                 $r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
 
-        $r['caller_get_posts'] = true;
+        $r['ignore_stickies'] = true;
 
         $get_posts = new WP_Query;
         return $get_posts->query($r);
-
 }
 
 //

wp-includes/default-widgets.php

@@ -542 +542 @@
                 else if ( $number > 15 )
                         $number = 15;
 
-                $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'caller_get_posts' => 1));
+                $r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'ignore_stickies' => true));
                 if ($r->have_posts()) :
 ?>
                 <?php echo $before_widget; ?>

wp-includes/query.php

@@ -1625 +1625 @@
                 $post_status_join = false;
                 $page = 1;
 
-                if ( !isset($q['caller_get_posts']) )
-                        $q['caller_get_posts'] = false;
+                if ( isset( $q['caller_get_posts'] ) ) {
+                        _deprecated_argument( 'WP_Query', '3.1', __( '"caller_get_posts" is deprecated. Use "ignore_stickies" instead.' ) );
+                        if ( !isset( $q['ignore_stickies'] ) )
+                                $q['ignore_stickies'] = $q['caller_get_posts'];
+                }
 
+                if ( !isset( $q['ignore_stickies'] ) )
+                        $q['ignore_stickies'] = false;
+
                 if ( !isset($q['suppress_filters']) )
                         $q['suppress_filters'] = false;
 
@@ -2468 +2474 @@
 
                 // Put sticky posts at the top of the posts array
                 $sticky_posts = get_option('sticky_posts');
-                if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['caller_get_posts'] ) {
+                if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['ignore_stickies'] ) {
                         $num_posts = count($this->posts);
                         $sticky_offset = 0;
                         // Loop over posts and relocate stickies to the front.