vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Comment feed fixes from David House. fixes #2570

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@3644 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Ryan Boren
2006-03-17 01:16:22 +00:00
parent 204501c750
commit eab1586158
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wp-includes/functions.php
View File

@@ -2015,7 +2015,7 @@ function remove_query_arg($key, $query) {
function load_template($file) {
global $posts, $post, $wp_did_header, $wp_did_template_redirect, $wp_query,
$wp_rewrite, $wpdb, $wp_version, $wp;
$wp_rewrite, $wpdb, $wp_version, $wp, $id, $comment;
extract($wp_query->query_vars);
@@ -2220,7 +2220,7 @@ function do_feed() {
$feed = 'rss2';
$for_comments = false;
if ( is_single() || ($withcomments == 1) ) {
if ( is_single() || (get_query_var('withcomments') == 1) ) {
$feed = 'rss2';
$for_comments = true;
}
@@ -2238,10 +2238,11 @@ function do_feed_rss() {
}
function do_feed_rss2($for_comments) {
if ( $for_comments )
if ( $for_comments ) {
load_template(ABSPATH . 'wp-commentsrss2.php');
else
} else {
load_template(ABSPATH . 'wp-rss2.php');
}
}
function do_feed_atom() {