WordPress 4.7.1-scripts

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

diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php
index ae4cd7976c971c5838f5bc525a408557e1aca892..09cb7c016ec5ccacc4e3597e796faef2431fbc94 100644 (file)
--- a/wp-includes/feed-atom.php
+++ b/wp-includes/feed-atom.php
@@ -27,10 +27,13 @@ do_action( 'rss_tag_pre', 'atom' );
   do_action( 'atom_ns' );
   ?>
  >
-       <title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
+       <title type="text"><?php 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>
+       <updated><?php
+               $date = get_lastpostmodified( 'GMT' );
+               echo $date ? mysql2date( 'Y-m-d\TH:i:s\Z', $date ) : date( 'Y-m-d\TH:i:s\Z' );
+       ?></updated>
 
        <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php bloginfo_rss('url') ?>" />
        <id><?php bloginfo('atom_url'); ?></id>
@@ -78,10 +81,13 @@ do_action( 'rss_tag_pre', 'atom' );
         * @since 2.0.0
         */
        do_action( 'atom_entry' );
+
+       if ( get_comments_number() || comments_open() ) :
                ?>
                <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>
+       <?php endif; ?>
        </entry>
        <?php endwhile ; ?>
 </feed>