WordPress 4.6.3-scripts

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

diff --git a/wp-includes/feed-rss2-comments.php b/wp-includes/feed-rss2-comments.php
index 2a71da1f2c17389cdcbd6164035b92c1373eb954..f05bb8f71a2008ec8ac303b341349c730ba882c2 100644 (file)
--- a/wp-includes/feed-rss2-comments.php
+++ b/wp-includes/feed-rss2-comments.php
@@ -5,7 +5,7 @@
  * @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);
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
 
@@ -38,16 +38,20 @@ do_action( 'rss_tag_pre', 'rss2-comments' );
                elseif ( is_search() )
                        printf( ent2ncr( __( 'Comments for %1$s searching on %2$s' ) ), get_bloginfo_rss( 'name' ), get_search_query() );
                else
-                       printf( ent2ncr( __( 'Comments for %s' ) ), get_bloginfo_rss( 'name' ) . get_wp_title_rss() );
+                       printf( ent2ncr( __( 'Comments for %s' ) ), get_wp_title_rss() );
        ?></title>
        <atom:link href="<?php self_link(); ?>" rel="self" type="application/rss+xml" />
        <link><?php (is_single()) ? the_permalink_rss() : bloginfo_rss("url") ?></link>
        <description><?php bloginfo_rss("description") ?></description>
        <lastBuildDate><?php echo mysql2date('r', get_lastcommentmodified('GMT')); ?></lastBuildDate>
-       <?php /** This filter is documented in wp-includes/feed-rss2.php */ ?>
-       <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
-       <?php /** This filter is documented in wp-includes/feed-rss2.php */ ?>
-       <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>
+       <sy:updatePeriod><?php
+               /** This filter is documented in wp-includes/feed-rss2.php */
+               echo apply_filters( 'rss_update_period', 'hourly' );
+       ?></sy:updatePeriod>
+       <sy:updateFrequency><?php
+               /** This filter is documented in wp-includes/feed-rss2.php */
+               echo apply_filters( 'rss_update_frequency', '1' );
+       ?></sy:updateFrequency>
        <?php
        /**
         * Fires at the end of the RSS2 comment feed header.