WordPress 3.8.1

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

diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index f8f08c87e7c31e38d6c1b87f775c40a814f68b60..666b52df99cad3e3523d939cbb32c757a9baa3aa 100644 (file)
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -14,29 +14,51 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
   xmlns:thr="http://purl.org/syndication/thread/1.0"
   xml:lang="<?php bloginfo_rss( 'language' ); ?>"
   xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
-  <?php do_action('atom_ns'); ?>
+  <?php
+  /**
+   * Fires at end of the Atom feed root to add namespaces.
+   *
+   * @since 2.0.0
+   */
+  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'), false); ?></updated>
 
-       <link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" />
+       <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php bloginfo_rss('url') ?>" />
        <id><?php bloginfo('atom_url'); ?></id>
        <link rel="self" type="application/atom+xml" href="<?php self_link(); ?>" />
 
-       <?php do_action('atom_head'); ?>
-       <?php while (have_posts()) : the_post(); ?>
+       <?php
+       /**
+        * Fires just before the first Atom feed entry.
+        *
+        * @since 2.0.0
+        */
+       do_action( 'atom_head' );
+
+       while ( have_posts() ) : the_post();
+       ?>
        <entry>
                <author>
                        <name><?php the_author() ?></name>
                        <?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'); ?>
+
+                       /**
+                        * Fires at the end of each Atom feed author entry.
+                        *
+                        * @since 3.2.0
+                        */
+                       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() ?>" />
+               <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" 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>
@@ -45,10 +67,16 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <?php if ( !get_option('rss_use_excerpt') ) : ?>
                <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()?>"/>
+       <?php atom_enclosure();
+       /**
+        * Fires at the end of each Atom feed item.
+        *
+        * @since 2.0.0
+        */
+       do_action( 'atom_entry' );
+               ?>
+               <link rel="replies" type="<?php bloginfo_rss('html_type'); ?>" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
+               <link rel="replies" type="application/atom+xml" href="<?php echo esc_url( 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 ; ?>