Changeset 20398

Timestamp:

04/07/2012 05:39:08 AM (13 years ago)

Author:

markjaquith

Message:

Handle page= and feed= query strings in redirect_guess_404_permalink(). fixes #20387

File:

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

trunk/wp-includes/canonical.php

@@ -102 +102 @@
         if ( ! $redirect_url ) {
             if ( $redirect_url = redirect_guess_404_permalink( $requested_url ) ) {
-                $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
+                $redirect['query'] = _remove_qs_args_if_not_in_url( $redirect['query'], array( 'page', 'feed', 'p', 'page_id', 'attachment_id', 'pagename', 'name', 'post_type' ), $redirect_url );
             }
         }
@@ -490 +490 @@
         if ( ! $post_id )
             return false;
-        return get_permalink( $post_id );
+        if ( get_query_var( 'feed' ) )
+            return get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
+        elseif ( get_query_var( 'page' ) )
+            return trailingslashit( get_permalink( $post_id ) ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );
+        else
+            return get_permalink( $post_id );
     }