Ticket #21841: 21841.2.patch

wp-includes/feed-atom-comments.php

@@ -28 +28 @@
 
 <?php if ( is_singular() ) { ?>
         <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php comments_link_feed(); ?>" />
-        <link rel="self" type="application/atom+xml" href="<?php echo get_post_comments_feed_link('', 'atom'); ?>" />
+        <link rel="self" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link('', 'atom') ); ?>" />
         <id><?php echo get_post_comments_feed_link('', 'atom'); ?></id>
 <?php } elseif(is_search()) { ?>
         <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" href="<?php echo home_url() . '?s=' . get_search_query(); ?>" />

wp-includes/feed-atom.php

@@ -48 +48 @@
 <?php atom_enclosure(); ?>
 <?php do_action('atom_entry'); ?>
                 <link rel="replies" type="<?php bloginfo_rss('html_type'); ?>" href="<?php the_permalink_rss() ?>#comments" thr:count="<?php echo get_comments_number()?>"/>
-                <link rel="replies" type="application/atom+xml" href="<?php echo get_post_comments_feed_link(0,'atom') ?>" thr:count="<?php echo get_comments_number()?>"/>
+                <link rel="replies" type="application/atom+xml" href="<?php echo esc_url( get_post_comments_feed_link(0, 'atom') ); ?>" thr:count="<?php echo get_comments_number()?>"/>
                 <thr:total><?php echo get_comments_number()?></thr:total>
         </entry>
         <?php endwhile ; ?>

wp-includes/link-template.php

@@ -484 +484 @@
         } 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);