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

markjaquith · markjaquith · commit 93680ad646ce · 2010-09-07T04:46:08.000Z
git-svn-id: https://develop.svn.wordpress.org/trunk@15589 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
@@ -542,7 +542,7 @@ function widget($args, $instance) {
 		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_sticky_posts' => true));
 		if ($r->have_posts()) :
 ?>
 		<?php echo $before_widget; ?>
diff --git a/wp-includes/post.php b/wp-includes/post.php
@@ -1122,7 +1122,7 @@ function get_posts($args = null) {
 	} elseif ( ! empty($r['exclude']) )
 		$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;
 
 	$get_posts = new WP_Query;
diff --git a/wp-includes/query.php b/wp-includes/query.php
@@ -1540,8 +1540,14 @@ function &get_posts() {
 		$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_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']) )
 			$q['suppress_filters'] = false;
@@ -2377,7 +2383,7 @@ function &get_posts() {
 
 		// 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;
 			// Loop over posts and relocate stickies to the front.
