WP Merge to rev #4147

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

1 files changed, 5 insertions, 5 deletions

diff --git a/wp-rss.php b/wp-rss.php
index aa4a636..a342ee5 100644
--- a/wp-rss.php
+++ b/wp-rss.php
@@ -5,11 +5,11 @@ if (empty($wp)) {
 	wp('feed=rss');
 }
 
-header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: text/xml; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 ?>
-<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <!-- generator="wordpress/<?php echo $wp_version ?>" -->
 <rss version="0.92">
 <channel>
@@ -24,14 +24,14 @@ $more = 1;
 <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
 	<item>
 		<title><?php the_title_rss() ?></title>
-<?php if (get_settings('rss_use_excerpt')) { ?>
+<?php if (get_option('rss_use_excerpt')) { ?>
 		<description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
 <?php } else { // use content ?>
-		<description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length')) ?></description>
+		<description><?php the_content_rss('', 0, '', get_option('rss_excerpt_length')) ?></description>
 <?php } ?>
 		<link><?php permalink_single_rss() ?></link>
 		<?php do_action('rss_item'); ?>
 	</item>
-<?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>
+<?php $items_count++; if (($items_count == get_option('posts_per_rss')) && empty($m)) { break; } } } ?>
 </channel>
 </rss>