WordPress 3.3.2-scripts

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

diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index 469e4bc8c96799d8a63a979fda8ab63d99d69995..b26897d3e62973b15aa0a74ea6936938e8ce9d7c 100644 (file)
--- a/wp-includes/feed-rss.php
+++ b/wp-includes/feed-rss.php
@@ -1,10 +1,14 @@
 <?php
 <?php

-header('Content-Type: text/xml; charset=' . get_option('blog_charset'), true);
+/**
+ * RSS 0.92 Feed Template for displaying RSS 0.92 Posts feed.
+ *
+ * @package WordPress
+ */
+
+header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_option('blog_charset'), true);

 $more = 1;
 
 $more = 1;
 

-?>
-<?php echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
-<!-- generator="wordpress/<?php echo $wp_version ?>" -->
+echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>

 <rss version="0.92">
 <channel>
        <title><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
 <rss version="0.92">
 <channel>
        <title><?php bloginfo_rss('name'); wp_title_rss(); ?></title>


@@ -18,11 +22,7 @@ $more = 1;
 <?php while (have_posts()) : the_post(); ?>
        <item>
                <title><?php the_title_rss() ?></title>
 <?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>
                <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'); ?>
        </item>
                <link><?php the_permalink_rss() ?></link>
                <?php do_action('rss_item'); ?>
        </item>