X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..4feeb71a9d812a9ae371c28a3d8b442a4394ded7:/wp-includes/feed-rss.php

diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index e5c2fe83..df231968 100644
--- a/wp-includes/feed-rss.php
+++ b/wp-includes/feed-rss.php
@@ -5,31 +5,41 @@
  * @package WordPress
  */
 
-header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);
+header('Content-Type: ' . feed_content_type('rss') . '; charset=' . get_option('blog_charset'), true);
 $more = 1;
 
 echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
-<?php the_generator( 'comment' ); ?>
 <rss version="0.92">
 <channel>
-	<title><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
+	<title><?php wp_title_rss(); ?></title>
 	<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>
 	<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>