WordPress 4.2.5

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

diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index fdeeed87deb3f965d82c8d5f64ba9985d92383ac..1650434405c8a917f1c01bdd2de6403a4538d1a9 100644 (file)
--- a/wp-includes/feed-rss.php
+++ b/wp-includes/feed-rss.php
@@ -5,12 +5,10 @@
  * @package WordPress
  */
 
-header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
-<?php the_generator( 'comment' ); ?>
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
 <rss version="0.92">
 <channel>
        <title><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
@@ -18,19 +16,30 @@ $more = 1;
        <description><?php bloginfo_rss('description') ?></description>
        <lastBuildDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_lastpostmodified('GMT'), false); ?></lastBuildDate>
        <docs>http://backend.userland.com/rss092</docs>
-       <language><?php echo get_option('rss_language'); ?></language>
-       <?php do_action('rss_head'); ?>
+       <language><?php bloginfo_rss( 'language' ); ?></language>
+
+       <?php
+       /**
+        * Fires at the end of the RSS Feed Header.
+        *
+        * @since 2.0.0
+        */
+       do_action( 'rss_head' );
+       ?>
 
 <?php while (have_posts()) : the_post(); ?>
        <item>
                <title><?php the_title_rss() ?></title>
-<?php if (get_option('rss_use_excerpt')) { ?>
                <description><![CDATA[<?php the_excerpt_rss() ?>]]></description>
-<?php } else { // use content ?>
-               <description><?php the_content_rss('', 0, '', get_option('rss_excerpt_length')) ?></description>
-<?php } ?>
                <link><?php the_permalink_rss() ?></link>
-               <?php do_action('rss_item'); ?>
+               <?php
+               /**
+                * Fires at the end of each RSS feed item.
+                *
+                * @since 2.0.0
+                */
+               do_action( 'rss_item' );
+               ?>
        </item>
 <?php endwhile; ?>
 </channel>