Changeset 14954

Timestamp:

05/26/2010 07:56:26 PM (16 years ago)

Author:

markjaquith

Message:

Properly redirect custom post type URLs in redirect_canonical(). fixes #13561

File:

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

trunk/wp-includes/canonical.php

@@ -76 +76 @@
 
                         if ( $redirect_url = get_permalink($id) )
-                                $redirect['query'] = remove_query_arg(array('p', 'page_id', 'attachment_id'), $redirect['query']);
+                                $redirect['query'] = remove_query_arg(array('p', 'page_id', 'attachment_id', 'post_type'), $redirect['query']);
                 }
         }
@@ -89 +89 @@
                         if ( $post_type_obj->public ) {
                                 $redirect_url = get_permalink($redirect_post);
-                                $redirect['query'] = remove_query_arg(array('p', 'page_id', 'attachment_id'), $redirect['query']);
+                                $redirect['query'] = remove_query_arg(array('p', 'page_id', 'attachment_id', 'post_type'), $redirect['query']);
                         }
                 }
@@ -103 +103 @@
                 } elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
                         if ( $redirect_url = get_permalink(get_query_var('p')) )
-                                $redirect['query'] = remove_query_arg('p', $redirect['query']);
+                                $redirect['query'] = remove_query_arg(array('p', 'post_type'), $redirect['query']);
                         if ( get_query_var( 'page' ) ) {
                                 $redirect_url = trailingslashit( $redirect_url ) . user_trailingslashit( get_query_var( 'page' ), 'single_paged' );