Changeset 15589

Timestamp:

09/07/2010 04:46:08 AM (14 years ago)

Author:

markjaquith

Message:

Rename caller_get_posts WP_Query flag to ignore_sticky_posts, because that is the only thing it does. fixes #14624. props scribu

Location:

trunk/wp-includes

Files:

• default-widgets.php (modified) (1 diff)
• post.php (modified) (1 diff)
• query.php (modified) (2 diffs)

trunk/wp-includes/default-widgets.php

@@ -543 +543 @@
             $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_sticky_posts' => true));
         if ($r->have_posts()) :
 ?>

trunk/wp-includes/post.php

@@ -1123 +1123 @@
         $r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
 
-    $r['caller_get_posts'] = true;
+    $r['ignore_sticky_posts'] = true;
     $r['no_found_rows'] = true;
 

trunk/wp-includes/query.php

@@ -1541 +1541 @@
         $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_sticky_posts" instead.' ) );
+            if ( !isset( $q['ignore_sticky_posts'] ) )
+                $q['ignore_sticky_posts'] = $q['caller_get_posts'];
+        }
+
+        if ( !isset( $q['ignore_sticky_posts'] ) )
+            $q['ignore_sticky_posts'] = false;
 
         if ( !isset($q['suppress_filters']) )
@@ -2378 +2384 @@
         // 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_sticky_posts'] ) {
             $num_posts = count($this->posts);
             $sticky_offset = 0;