From 132f53ddaeb250222a4ac85ebc0bf4dd780db60e Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 23 Feb 2007 15:47:59 +0000
Subject: WP Merge to 4929

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@899 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/feed.php | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'wp-includes/feed.php')

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 04f54d9..abee911 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -89,21 +89,14 @@ function comment_text_rss() {
 }
 
 
-function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = '') {
-	$url = comments_rss($commentsrssfilename);
+function comments_rss_link($link_text = 'Comments RSS', $commentsrssfilename = 'nolongerused') {
+	$url = get_post_comments_feed_link();;
 	echo "<a href='$url'>$link_text</a>";
 }
 
 
-function comments_rss($commentsrssfilename = '') {
-	global $id;
-
-	if ( '' != get_option('permalink_structure') )
-		$url = trailingslashit( get_permalink() ) . user_trailingslashit('feed');
-	else
-		$url = get_option('home') . "/$commentsrssfilename?feed=rss2&amp;p=$id";
-
-	return apply_filters('post_comments_feed_link', $url);
+function comments_rss($commentsrssfilename = 'nolongerused') {
+	return get_post_comments_feed_link();
 }
 
 
-- 
cgit