diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-23 18:28:40 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-10-23 18:28:40 +0000 |
| commit | 87bb8cd69cc593fe6bed330fb1791eac9df87167 (patch) | |
| tree | 6b2ad252df89d2a1863198fd44b321b59e42ef54 /wp-includes/feed-atom.php | |
| parent | 0cbda3349a2571904ea063fdd73e018299919589 (diff) | |
| download | wordpress-mu-87bb8cd69cc593fe6bed330fb1791eac9df87167.tar.gz wordpress-mu-87bb8cd69cc593fe6bed330fb1791eac9df87167.tar.xz wordpress-mu-87bb8cd69cc593fe6bed330fb1791eac9df87167.zip | |
Merge with WordPress, rev 6285 and untested
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1125 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/feed-atom.php')
| -rw-r--r-- | wp-includes/feed-atom.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php index f80f48f..5f5570d 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> - <generator uri="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator> + <?php the_generator( 'atom' ); ?> <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" /> <id><?php bloginfo('atom_url'); ?></id> @@ -30,15 +30,18 @@ $more = 1; <uri><?php the_author_url()?></uri> <?php endif; ?> </author> - <title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title> +<?php list($content_type, $content) = prep_atom_text_construct(get_the_title()); ?> + <title type="<?php echo $content_type ?>"><?php echo $content ?></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') ?> - <summary type="<?php html_type_rss(); ?>"><![CDATA[<?php the_excerpt_rss(); ?>]]></summary> +<?php list($content_type, $content) = prep_atom_text_construct(get_the_excerpt()); ?> + <summary type="<?php echo $content_type ?>"><?php echo $content ?></summary> <?php if ( !get_option('rss_use_excerpt') ) : ?> - <content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content> +<?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> <?php endif; ?> <?php atom_enclosure(); ?> <?php do_action('atom_entry'); ?> |