From d85d717aedbc7690e2a450e40dab8fcebd94b38c Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 30 Oct 2007 16:49:38 +0000
Subject: Merge with WordPress 2.3.1

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

(limited to 'wp-includes/feed-atom.php')

diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index 5f5570d..f80f48f 100644
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -15,7 +15,7 @@ $more = 1;
 	<subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
 
 	<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
-	<?php the_generator( 'atom' ); ?>
+	<generator uri="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
 
 	<link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
 	<id><?php bloginfo('atom_url'); ?></id>
@@ -30,18 +30,15 @@ $more = 1;
 			<uri><?php the_author_url()?></uri>
 			<?php endif; ?>
 		</author>
-<?php list($content_type, $content) = prep_atom_text_construct(get_the_title()); ?>
-	        <title type="<?php echo $content_type ?>"><?php echo $content ?></title>
+		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
 		<link rel="alternate" type="text/html" href="<?php the_permalink_rss() ?>" />
 		<id><?php the_guid(); ?></id>
 		<updated><?php echo get_post_modified_time('Y-m-d\TH:i:s\Z', true); ?></updated>
 		<published><?php echo get_post_time('Y-m-d\TH:i:s\Z', true); ?></published>
 		<?php the_category_rss('atom') ?>
-<?php list($content_type, $content) = prep_atom_text_construct(get_the_excerpt()); ?>
-	        <summary type="<?php echo $content_type ?>"><?php echo $content ?></summary>
+		<summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary>
 <?php if ( !get_option('rss_use_excerpt') ) : ?>
-<?php list($content_type, $content) = prep_atom_text_construct(get_the_content()); ?>
-	        <content type="<?php echo $content_type ?>" xml:base="<?php the_permalink_rss()?>"><?php echo $content ?></content>
+		<content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
 <?php endif; ?>
 <?php atom_enclosure(); ?>
 <?php do_action('atom_entry'); ?>
-- 
cgit