From 2bca2af5fda409d1e3fbd6448674b195a9017de5 Mon Sep 17 00:00:00 2001 From: markjaquith Date: Fri, 6 Apr 2012 19:49:34 +0000 Subject: [PATCH] Strip p, page_id, attachment_id, post_type, pagename, and name from redirect query if we get a hit on a 404-guessed permalink. fixes #20374 git-svn-id: http://svn.automattic.com/wordpress/trunk@20380 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/canonical.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index 57cc31425..1b148e268 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -92,8 +92,10 @@ function redirect_canonical( $requested_url = null, $do_redirect = true ) { } } - if ( ! $redirect_url ) + if ( ! $redirect_url ) { $redirect_url = redirect_guess_404_permalink( $requested_url ); + $redirect['query'] = remove_query_arg( array( 'p', 'page_id', 'attachment_id', 'post_type', 'pagename', 'name' ), $redirect['query'] ); + } } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) { // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101