From 148dac95dfcfdd62a8228fe8a8ff08a6156e8794 Mon Sep 17 00:00:00 2001
From: nacin <nacin@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 13 Oct 2010 05:25:00 +0000
Subject: [PATCH] s/showposts/posts_per_page/

git-svn-id: http://svn.automattic.com/wordpress/trunk@15788 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/nav-menu.php  | 2 +-
 wp-includes/default-widgets.php | 2 +-
 wp-includes/nav-menu.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/nav-menu.php b/wp-admin/includes/nav-menu.php
index 8c8e9697f..bf2322788 100644
--- a/wp-admin/includes/nav-menu.php
+++ b/wp-admin/includes/nav-menu.php
@@ -652,7 +652,7 @@ function wp_nav_menu_item_post_type_meta_box( $object, $post_type ) {
 		?>">
 			<ul id="<?php echo $post_type_name; ?>checklist-most-recent" class="categorychecklist form-no-clear">
 				<?php
-				$recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'showposts' => 15 ) );
+				$recent_args = array_merge( $args, array( 'orderby' => 'post_date', 'order' => 'DESC', 'posts_per_page' => 15 ) );
 				$most_recent = $get_posts->query( $recent_args );
 				$args['walker'] = $walker;
 				echo walk_nav_menu_tree( array_map('wp_setup_nav_menu_item', $most_recent), 0, (object) $args );
diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index 6a63fa1f0..1faf90c51 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -542,7 +542,7 @@ class WP_Widget_Recent_Posts extends WP_Widget {
 		else if ( $number > 15 )
 			$number = 15;
 
-		$r = new WP_Query(array('showposts' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'ignore_sticky_posts' => true));
+		$r = new WP_Query(array('posts_per_page' => $number, 'nopaging' => 0, 'post_status' => 'publish', 'ignore_sticky_posts' => true));
 		if ($r->have_posts()) :
 ?>
 		<?php echo $before_widget; ?>
diff --git a/wp-includes/nav-menu.php b/wp-includes/nav-menu.php
index 8cb5bfe67..e1af8f7aa 100644
--- a/wp-includes/nav-menu.php
+++ b/wp-includes/nav-menu.php
@@ -653,7 +653,7 @@ function wp_get_associated_nav_menu_items( $object_id = 0, $object_type = 'post_
 			'meta_value' => $object_id,
 			'post_status' => 'any',
 			'post_type' => 'nav_menu_item',
-			'showposts' => -1,
+			'posts_per_page' => -1,
 		)
 	);
 	foreach( (array) $menu_items as $menu_item ) {