Changeset 14141

Timestamp:

04/18/2010 06:51:16 AM (14 years ago)

Author:

dd32

Message:

Advertise the correct comment feed link for a Page on the Front. Do not canonical redirect the front page comments feeds to home. Fixes #12452

Location:

trunk/wp-includes

Files:

• canonical.php (modified) (1 diff)
• link-template.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -101 +101 @@
             if ( $redirect_url = get_permalink(get_query_var('page_id')) )
                 $redirect['query'] = remove_query_arg('page_id', $redirect['query']);
-        } elseif ( is_page() && isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front')  && ! $redirect_url ) {
+        } elseif ( is_page() && !is_feed() && isset($wp_query->queried_object) && 'page' == get_option('show_on_front') && $wp_query->queried_object->ID == get_option('page_on_front')  && ! $redirect_url ) {
             $redirect_url = home_url('/');
         } elseif ( is_home() && !empty($_GET['page_id']) && 'page' == get_option('show_on_front') && get_query_var('page_id') == get_option('page_for_posts')  && ! $redirect_url ) {

trunk/wp-includes/link-template.php

@@ -472 +472 @@
 
     if ( '' != get_option('permalink_structure') ) {
-        $url = trailingslashit( get_permalink($post_id) ) . 'feed';
+        if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
+            $url = _get_page_link( $post_id );
+        else
+            $url = get_permalink($post_id);
+
+        $url = trailingslashit($url) . 'feed';
         if ( $feed != get_default_feed() )
             $url .= "/$feed";