From b764f60728be1d4e026f9d7ae618ab47e23322f8 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Thu, 31 Aug 2006 14:55:29 +0000
Subject: WP Merge to rev #4147

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@729 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-atom.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'wp-atom.php')

diff --git a/wp-atom.php b/wp-atom.php
index feb2845..2069bdf 100644
--- a/wp-atom.php
+++ b/wp-atom.php
@@ -5,11 +5,11 @@ if (empty($wp)) {
 	wp('feed=atom');
 }
 
-header('Content-type: application/atom+xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: application/atom+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').'"?'.'>'; ?>
 <feed version="0.3"
   xmlns="http://purl.org/atom/ns#"
   xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -35,11 +35,11 @@ $more = 1;
 		<issued><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></issued>
 		<?php the_category_rss('rdf') ?> 
 		<summary type="text/plain" mode="escaped"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
-<?php if ( !get_settings('rss_use_excerpt') ) : ?>
+<?php if ( !get_option('rss_use_excerpt') ) : ?>
 		<content type="<?php bloginfo('html_type'); ?>" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
 <?php endif; ?>
 <?php rss_enclosure(); ?>
 <?php do_action('atom_entry'); ?>
 	</entry>
-	<?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; } } } ?>
 </feed>
-- 
cgit