WordPress 3.4

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

diff --git a/wp-includes/feed-rss.php b/wp-includes/feed-rss.php
index e5c2fe830a851d7102df0aadb9d0621bb7d3f19d..2e6c93384596bacb78cfa74b1672275b22fae544 100644 (file)
--- a/wp-includes/feed-rss.php
+++ b/wp-includes/feed-rss.php
@@ -9,7 +9,6 @@ header('Content-Type: ' . feed_content_type('rss-http') . '; charset=' . get_opt
 $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>
@@ -17,17 +16,13 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
        <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>
+       <language><?php bloginfo_rss( 'language' ); ?></language>
        <?php 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'); ?>
        </item>