diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-26 14:03:58 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-02-26 14:03:58 +0000 |
| commit | ce8693de30e8da06a8a4982e321f0a33fbeee979 (patch) | |
| tree | c80ea3a19e84d0da5a48815fe4457e46f784e193 /wp-includes/functions.php | |
| parent | 132f53ddaeb250222a4ac85ebc0bf4dd780db60e (diff) | |
| download | wordpress-mu-ce8693de30e8da06a8a4982e321f0a33fbeee979.tar.gz wordpress-mu-ce8693de30e8da06a8a4982e321f0a33fbeee979.tar.xz wordpress-mu-ce8693de30e8da06a8a4982e321f0a33fbeee979.zip | |
WP Merge to rev 4950
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@900 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/functions.php')
| -rw-r--r-- | wp-includes/functions.php | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php index ca65479..4ae978a 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -962,23 +962,10 @@ function do_feed() { $feed = preg_replace('/^_+/', '', $feed); if ( $feed == '' || $feed == 'feed' ) - $feed = 'rss2'; - - $for_comments = false; - - if ( is_singular() || get_query_var('withcomments') == 1 ) - $for_comments = true; - - if ( false !== strpos($feed, 'comments-') ) { - $for_comments = true; - $feed = str_replace('comments-', '', $feed); - } - - if ( get_query_var('withoutcomments') == 1 ) - $for_comments = false; + $feed = 'rss2'; $hook = 'do_feed_' . $feed; - do_action($hook, $for_comments); + do_action($hook, $wp_query->is_comment_feed); } function do_feed_rdf() { |