Ticket #3065: patch.txt

Index: wp-includes/feed.php
===================================================================
--- wp-includes/feed.php        (revision 4111)
+++ wp-includes/feed.php        (working copy)
@@ -59,7 +59,11 @@
 }
 
 function permalink_single_rss($file = '') {
-    echo get_permalink();
+    /* This update cleans up permalinks, necessary for a syndicated feed */
+    $url = get_permalink();
+    $url = str_replace("&", "&", $url);
+    $url = str_replace("&", "&", $url);
+    echo $url;
 }
 
 function comment_link() {
@@ -92,6 +96,9 @@
        else
                $url = get_settings('home') . "/$commentsrssfilename?feed=rss2&p=$id";
 
+      /* This update cleans up permalinks, necessary for a syndicated feed */
+      $url = str_replace("&", "&", $url);
+      $url = str_replace("&", "&", $url);
        return apply_filters('post_comments_feed_link', $url);
 }
 
Index: wp-includes/comment-template.php
===================================================================
--- wp-includes/comment-template.php    (revision 4111)
+++ wp-includes/comment-template.php    (working copy)
@@ -142,7 +142,11 @@
 }
 
 function comments_link( $file = '', $echo = true ) {
-    echo get_comments_link();
+      /* Cleans things up when a syndicated feed doesn't do ampersands properly */
+      $url = get_comments_link();
+      $url = str_replace("&", "&", $url);
+      $url = str_replace("&", "&", $url);
+      echo $url;
 }
 
 function get_comments_number( $post_id = 0 ) {