diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index a9744e89aa..abdd265e3a 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -1215,7 +1215,7 @@ function get_author_rss_link($echo = false, $author_id = 1) { */ function comments_rss() { _deprecated_function( __FUNCTION__, '2.2', 'get_post_comments_feed_link()' ); - return get_post_comments_feed_link(); + return esc_url( get_post_comments_feed_link() ); } /** diff --git a/wp-includes/feed-atom-comments.php b/wp-includes/feed-atom-comments.php index 1577db7b11..174670379c 100644 --- a/wp-includes/feed-atom-comments.php +++ b/wp-includes/feed-atom-comments.php @@ -28,8 +28,8 @@ echo '' - - + + diff --git a/wp-includes/feed-atom.php b/wp-includes/feed-atom.php index b79caefdae..983c8f4a3d 100644 --- a/wp-includes/feed-atom.php +++ b/wp-includes/feed-atom.php @@ -48,7 +48,7 @@ echo ''; ?> - + diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index f80cfb66ff..10c43564da 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -484,9 +484,9 @@ function get_post_comments_feed_link($post_id = 0, $feed = '') { } else { $type = get_post_field('post_type', $post_id); if ( 'page' == $type ) - $url = home_url("?feed=$feed&page_id=$post_id"); + $url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) ); else - $url = home_url("?feed=$feed&p=$post_id"); + $url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) ); } return apply_filters('post_comments_feed_link', $url); @@ -509,7 +509,7 @@ function get_post_comments_feed_link($post_id = 0, $feed = '') { * @return string Link to the comment feed for the current post. */ function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) { - $url = get_post_comments_feed_link($post_id, $feed); + $url = esc_url( get_post_comments_feed_link( $post_id, $feed ) ); if ( empty($link_text) ) $link_text = __('Comments Feed'); diff --git a/wp-includes/theme-compat/comments-popup.php b/wp-includes/theme-compat/comments-popup.php index 79dccbef5b..eb74834cd3 100644 --- a/wp-includes/theme-compat/comments-popup.php +++ b/wp-includes/theme-compat/comments-popup.php @@ -32,7 +32,7 @@ while( have_posts()) : the_post(); ?>

-

RSS feed for comments on this post.'); ?>

+

RSS feed for comments on this post.'); ?>

URL to TrackBack this entry is: %s'), get_trackback_url()); ?>