WordPress 3.4

[autoinstalls/wordpress.git] / wp-includes / feed-atom.php

diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index f80f48f9d8472384d0009318deb64824a2679b0e..f8f08c87e7c31e38d6c1b87f775c40a814f68b60 100644 (file)
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -1,47 +1,55 @@
 <?php
-header('Content-Type: application/atom+xml; charset=' . get_option('blog_charset'), true);
+/**
+ * Atom Feed Template for displaying Atom Posts feed.
+ *
+ * @package WordPress
+ */
+
+header('Content-Type: ' . feed_content_type('atom') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <feed
   xmlns="http://www.w3.org/2005/Atom"
   xmlns:thr="http://purl.org/syndication/thread/1.0"
-  xml:lang="<?php echo get_option('rss_language'); ?>"
-  xml:base="<?php bloginfo_rss('home') ?>/wp-atom.php"
+  xml:lang="<?php bloginfo_rss( 'language' ); ?>"
+  xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
   <?php do_action('atom_ns'); ?>
  >
        <title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
        <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>
+       <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></updated>
 
-       <link rel="alternate" type="text/html" href="<?php bloginfo_rss('home') ?>" />
+       <link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" />
        <id><?php bloginfo('atom_url'); ?></id>
-       <link rel="self" type="application/atom+xml" href="<?php bloginfo('atom_url'); ?>" />
+       <link rel="self" type="application/atom+xml" href="<?php self_link(); ?>" />
 
        <?php do_action('atom_head'); ?>
        <?php while (have_posts()) : the_post(); ?>
        <entry>
                <author>
                        <name><?php the_author() ?></name>
-                       <?php $author_url = get_the_author_url(); if ( !empty($author_url) ) : ?>
-                       <uri><?php the_author_url()?></uri>
-                       <?php endif; ?>
+                       <?php $author_url = get_the_author_meta('url'); if ( !empty($author_url) ) : ?>
+                       <uri><?php the_author_meta('url')?></uri>
+                       <?php endif;
+                       do_action('atom_author'); ?>
                </author>
                <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>
+               <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 if ( !get_option('rss_use_excerpt') ) : ?>
-               <content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content>
+               <content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>"><![CDATA[<?php the_content_feed('atom') ?>]]></content>
 <?php endif; ?>
 <?php atom_enclosure(); ?>
 <?php do_action('atom_entry'); ?>
+               <link rel="replies" type="text/html" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
+               <link rel="replies" type="application/atom+xml" href="<?php echo get_post_comments_feed_link(0,'atom') ?>" thr:count="<?php echo get_comments_number()?>"/>
+               <thr:total><?php echo get_comments_number()?></thr:total>
        </entry>
        <?php endwhile ; ?>
 </feed>