Changeset 14355

Timestamp:

05/03/2010 12:37:11 AM (14 years ago)

Author:

dd32

Message:

Serve a canonical redirection for ?p=, ?page_id=, ?attachment_id= url's for incorrect post_types (ie. ?p=<page_id> will redirect to that page url). Fixes #13125

File:

• trunk/wp-includes/canonical.php (modified) (1 diff)

trunk/wp-includes/canonical.php

@@ -82 +82 @@
     // These tests give us a WP-generated permalink
     if ( is_404() ) {
-        $redirect_url = redirect_guess_404_permalink();
+
+        // Redirect ?page_id, ?p=, ?attachment_id= to their respective url's
+        $id = max( get_query_var('p'), get_query_var('page_id'), get_query_var('attachment_id'));
+        if ( $id && $redirect_url = get_permalink($id) )
+            $redirect['query'] = remove_query_arg(array('p', 'page_id', 'attachment_id'), $redirect['query']);
+    
+        if ( ! $redirect_url )
+            $redirect_url = redirect_guess_404_permalink();
+
     } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
         // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101