WordPress 3.3.2

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

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index b94e34766d6d81e8941c486576761faf0eb54b05..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;
 }
 
 /**