WordPress 4.4

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

diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php
index f7da5f2a9af23ecde5ad5684ae1daf9b2aaa073b..42ff4ea9913e6fdfecd5ca9f42c1c95bdec8c5cf 100644 (file)
--- a/wp-includes/feed-rss2.php
+++ b/wp-includes/feed-rss2.php
@@ -5,13 +5,13 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss2') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 
 /**
- * Fires between the <xml> and <rss> tags in a feed.
+ * Fires between the xml and rss tags in a feed.
  *
  * @since 4.0.0
  *
@@ -38,36 +38,38 @@ do_action( 'rss_tag_pre', 'rss2' );
 >
 
 <channel>
-       <title><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
+       <title><?php wp_title_rss(); ?></title>
        <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
        <link><?php bloginfo_rss('url') ?></link>
        <description><?php bloginfo_rss("description") ?></description>
        <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
        <language><?php bloginfo_rss( 'language' ); ?></language>
-       <?php
-       $duration = 'hourly';
-       /**
-        * Filter how often to update the RSS feed.
-        *
-        * @since 2.1.0
-        *
-        * @param string $duration The update period.
-        *                         Default 'hourly'. Accepts 'hourly', 'daily', 'weekly', 'monthly', 'yearly'.
-        */
-       ?>
-       <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', $duration ); ?></sy:updatePeriod>
-       <?php
-       $frequency = '1';
-       /**
-        * Filter the RSS update frequency.
-        *
-        * @since 2.1.0
-        *
-        * @param string $frequency An integer passed as a string representing the frequency
-        *                          of RSS updates within the update period. Default '1'.
-        */
-       ?>
-       <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', $frequency ); ?></sy:updateFrequency>
+       <sy:updatePeriod><?php
+               $duration = 'hourly';
+
+               /**
+                * Filter how often to update the RSS feed.
+                *
+                * @since 2.1.0
+                *
+                * @param string $duration The update period. Accepts 'hourly', 'daily', 'weekly', 'monthly',
+                *                         'yearly'. Default 'hourly'.
+                */
+               echo apply_filters( 'rss_update_period', $duration );
+       ?></sy:updatePeriod>
+       <sy:updateFrequency><?php
+               $frequency = '1';
+
+               /**
+                * Filter the RSS update frequency.
+                *
+                * @since 2.1.0
+                *
+                * @param string $frequency An integer passed as a string representing the frequency
+                *                          of RSS updates within the update period. Default '1'.
+                */
+               echo apply_filters( 'rss_update_frequency', $frequency );
+       ?></sy:updateFrequency>
        <?php
        /**
         * Fires at the end of the RSS2 Feed Header.
@@ -81,7 +83,9 @@ do_action( 'rss_tag_pre', 'rss2' );
        <item>
                <title><?php the_title_rss() ?></title>
                <link><?php the_permalink_rss() ?></link>
+<?php if ( get_comments_number() || comments_open() ) : ?>
                <comments><?php comments_link_feed(); ?></comments>
+<?php endif; ?>
                <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
                <dc:creator><![CDATA[<?php the_author() ?>]]></dc:creator>
                <?php the_category_rss('rss2') ?>
@@ -98,8 +102,10 @@ do_action( 'rss_tag_pre', 'rss2' );
                <content:encoded><![CDATA[<?php the_excerpt_rss(); ?>]]></content:encoded>
        <?php endif; ?>
 <?php endif; ?>
+<?php if ( get_comments_number() || comments_open() ) : ?>
                <wfw:commentRss><?php echo esc_url( get_post_comments_feed_link(null, 'rss2') ); ?></wfw:commentRss>
                <slash:comments><?php echo get_comments_number(); ?></slash:comments>
+<?php endif; ?>
 <?php rss_enclosure(); ?>
        <?php
        /**