From e2e1028be1e538611d21be1035bfc7cbc4e66918 Mon Sep 17 00:00:00 2001
From: saxmatt <saxmatt@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Mon, 31 Jan 2005 10:06:12 +0000
Subject: [PATCH] Fix for http://mosquito.wordpress.org/view.php?id=587

git-svn-id: http://svn.automattic.com/wordpress/trunk@2167 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-commentsrss2.php               | 4 ++--
 wp-includes/comment-functions.php | 5 +++++
 wp-includes/feed-functions.php    | 4 ++--
 wp-includes/functions.php         | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/wp-commentsrss2.php b/wp-commentsrss2.php
index 76847e8f7..6ea9cf499 100644
--- a/wp-commentsrss2.php
+++ b/wp-commentsrss2.php
@@ -47,9 +47,9 @@ if ($posts) { foreach ($posts as $post) { start_wp();
 ?>
 	<item>
 		<title>by: <?php comment_author_rss() ?></title>
-		<link><?php comment_link_rss() ?></link>
+		<link><?php comment_link() ?></link>
 		<pubDate><?php comment_time('r'); ?></pubDate>
-		<guid isPermaLink="false"><?php comment_ID(); echo ":".$comment->comment_post_ID; ?>@<?php bloginfo_rss("url") ?></guid>
+		<guid><?php comment_link() ?></guid>
 			<?php 
 			if (!empty($comment->post_password) && $_COOKIE['wp-postpass'] != $comment->post_password) {
 			?>
diff --git a/wp-includes/comment-functions.php b/wp-includes/comment-functions.php
index 6b741cb02..e170c0b2a 100644
--- a/wp-includes/comment-functions.php
+++ b/wp-includes/comment-functions.php
@@ -64,6 +64,11 @@ function get_comments_link() {
 	return get_permalink() . '#comments';
 }
 
+function get_comment_link() {
+	global $comment;
+	return get_permalink( $comment->comment_post_ID ) . '#comment-' . $comment->comment_ID;
+}
+
 function comments_link( $file = '', $echo = true ) {
     echo get_comments_link();
 }
diff --git a/wp-includes/feed-functions.php b/wp-includes/feed-functions.php
index 842a8b94a..03396e294 100644
--- a/wp-includes/feed-functions.php
+++ b/wp-includes/feed-functions.php
@@ -54,8 +54,8 @@ function permalink_single_rss($file = '') {
     echo get_permalink();
 }
 
-function comment_link_rss() {
-	echo get_comments_link();
+function comment_link() {
+	echo get_comment_link();
 }
 
 function comment_author_rss() {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index d4fed6a82..05dddcec4 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1668,4 +1668,4 @@ function wp_clearcookie() {
 	setcookie('wordpresspass_' . COOKIEHASH, ' ', time() - 31536000, SITECOOKIEPATH);
 }
 
-?>
+?>
\ No newline at end of file