Wordpress 3.3.1

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

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 1be12a45293f7f7096d388e482590f1642372272..34d8652b20d4a80f464d4c9dfd109054cfccfb8d 100644 (file)
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -63,7 +63,8 @@ function bloginfo_rss($show = '') {
  * @return string Default feed, or for example 'rss2', 'atom', etc.
  */
 function get_default_feed() {
-       return apply_filters('default_feed', 'rss2');
+       $default_feed = apply_filters('default_feed', 'rss2');
+       return 'rss' == $default_feed ? 'rss2' : $default_feed;
 }
 
 /**
@@ -161,7 +162,7 @@ function get_the_content_feed($feed_type = null) {
  * @param string $feed_type The type of feed. rss2 | atom | rss | rdf
  */
 function the_content_feed($feed_type = null) {
-       echo get_the_content_feed();
+       echo get_the_content_feed($feed_type);
 }
 
 /**
@@ -204,7 +205,7 @@ function comments_link_feed() {
  *
  * @package WordPress
  * @subpackage Feed
- * @since unknown
+ * @since 2.5.0
  *
  * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
  */
@@ -217,7 +218,7 @@ function comment_guid($comment_id = null) {
  *
  * @package WordPress
  * @subpackage Feed
- * @since unknown
+ * @since 2.5.0
  *
  * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
  * @return bool|string false on failure or guid for comment on success.