Wordpress 3.5

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

diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index b23dffcd9b2403ae26fa7e89ce6f3c5cfa9e4a21..983c8f4a3d7a31edaf693e2b547c26866346e77d 100644 (file)
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -12,7 +12,7 @@ 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:lang="<?php bloginfo_rss( 'language' ); ?>"
   xml:base="<?php bloginfo_rss('url') ?>/wp-atom.php"
   <?php do_action('atom_ns'); ?>
  >
@@ -21,7 +21,7 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 
        <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(); ?>" />
 
@@ -32,10 +32,11 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
                        <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; ?>
+                       <?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() ?>" />
+               <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>
@@ -46,8 +47,8 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <?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()?>"/>
+               <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 ; ?>