Changeset 20396

Timestamp:

04/07/2012 05:02:45 AM (13 years ago)

Author:

markjaquith

Message:

Fix a bunch of individual post comments feeds canonical redirects. Fixes three unit tests. fixes #20384

File:

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

trunk/wp-includes/canonical.php

@@ -66 +66 @@
     if ( !isset($redirect['query']) )
         $redirect['query'] = '';
+
+    if ( is_feed() && ( $id = get_query_var( 'p' ) ) ) {
+        if ( $redirect_url = get_post_comments_feed_link( $id, get_query_var( 'feed' ) ) ) {
+            $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type', 'feed'), $redirect_url );
+            $redirect['path'] = parse_url( $redirect_url, PHP_URL_PATH );
+        }
+    }
 
     if ( is_singular() && 1 > $wp_query->post_count && ($id = get_query_var('p')) ) {
@@ -220 +227 @@
             if ( is_feed() && in_array( get_query_var('feed'), $wp_rewrite->feeds ) ) {
                 $addl_path = !empty( $addl_path ) ? trailingslashit($addl_path) : '';
-                if ( get_query_var( 'withcomments' ) )
+                if ( !is_singular() && get_query_var( 'withcomments' ) )
                     $addl_path .= 'comments/';
                 if ( ( 'rss' == get_default_feed() && 'feed' == get_query_var('feed') ) || 'rss' == get_query_var('feed') )