WordPress 3.4-scripts

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

diff --git a/wp-includes/feed-rss2.php b/wp-includes/feed-rss2.php
index 538f96b72755cfc208597992e98b2390505ae5d7..8fc51d55ac110ada3b534dda6a0bb6bef3d9506b 100644 (file)
--- a/wp-includes/feed-rss2.php
+++ b/wp-includes/feed-rss2.php
@@ -26,7 +26,7 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
        <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>
-       <language><?php echo get_option('rss_language'); ?></language>
+       <language><?php bloginfo_rss( 'language' ); ?></language>
        <sy:updatePeriod><?php echo apply_filters( 'rss_update_period', 'hourly' ); ?></sy:updatePeriod>
        <sy:updateFrequency><?php echo apply_filters( 'rss_update_frequency', '1' ); ?></sy:updateFrequency>
        <?php do_action('rss2_head'); ?>
@@ -37,7 +37,7 @@ echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>'; ?>
                <comments><?php comments_link_feed(); ?></comments>
                <pubDate><?php echo mysql2date('D, d M Y H:i:s +0000', get_post_time('Y-m-d H:i:s', true), false); ?></pubDate>
                <dc:creator><?php the_author() ?></dc:creator>
-               <?php the_category_rss() ?>
+               <?php the_category_rss('rss2') ?>
 
                <guid isPermaLink="false"><?php the_guid(); ?></guid>
 <?php if (get_option('rss_use_excerpt')) : ?>