WP Merge to 4524

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@810 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 2 insertions, 2 deletions

diff --git a/wp-rss.php b/wp-rss.php
index a342ee5..c10b065 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -21,7 +21,7 @@ $more = 1;
 	<language><?php echo get_option('rss_language'); ?></language>
 	<?php do_action('rss_head'); ?>
 
-<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
+<?php while (have_posts()) : the_post(); ?>
 	<item>
 		<title><?php the_title_rss() ?></title>
 <?php if (get_option('rss_use_excerpt')) { ?>
@@ -32,6 +32,6 @@ $more = 1;
 		<link><?php permalink_single_rss() ?></link>
 		<?php do_action('rss_item'); ?>
 	</item>
-<?php $items_count++; if (($items_count == get_option('posts_per_rss')) && empty($m)) { break; } } } ?>
+<?php endwhile; ?>
 </channel>
 </rss>