Ticket #3065: patch2.txt

Index: wp-includes/formatting.php
===================================================================
--- wp-includes/formatting.php  (revision 4150)
+++ wp-includes/formatting.php  (working copy)
@@ -116,6 +116,13 @@
        return $text;
 }
 
+function amp( $url ) {
+
+      $url = str_replace("&", "&", $url);
+      $url = str_replace("&", "&", $url);
+      return $url;
+}
+
 function utf8_uri_encode( $utf8_string ) {
   $unicode = '';        
   $values = array();
Index: wp-includes/feed.php
===================================================================
--- wp-includes/feed.php        (revision 4150)
+++ wp-includes/feed.php        (working copy)
@@ -59,11 +59,15 @@
 }
 
 function permalink_single_rss($file = '') {
-    echo get_permalink();
+    $url = get_permalink();
+    $url = amp($url);
+    echo $url;
 }
 
 function comment_link() {
-       echo get_comment_link();
+      $url = get_comment_link();
+      $url = amp($url);
+       echo amp($url);
 }
 
 function get_comment_author_rss() {
Index: wp-includes/comment-template.php
===================================================================
--- wp-includes/comment-template.php    (revision 4150)
+++ wp-includes/comment-template.php    (working copy)
@@ -138,7 +138,9 @@
 }
 
 function get_comments_link() {
-       return get_permalink() . '#comments';
+      $url = get_permalink();
+      $url = amp($url);
+       return amp($url) . '#comments';
 }
 
 function comments_link( $file = '', $echo = true ) {