Changeset 22431 for trunk/wp-includes/link-template.php

Timestamp:

11/07/2012 07:56:10 PM (13 years ago)

Author:

nacin

Message:

Don't return encoded ampersands from get_post_comments_feed_link() to avoid canonical redirect issues. Apply esc_url() when appropriate.

props markjaquith, SergeyBiryukov. fixes #21841.

File:

• trunk/wp-includes/link-template.php (modified) (2 diffs)

trunk/wp-includes/link-template.php

@@ -485 +485 @@
         $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( '/' ) );
     }
 
@@ -510 +510 @@
 */
 function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
-    $url = get_post_comments_feed_link($post_id, $feed);
+    $url = esc_url( get_post_comments_feed_link( $post_id, $feed ) );
     if ( empty($link_text) )
         $link_text = __('Comments Feed');