From 6bee1ea91dcfedaf3bea1d7d9250aaa60026ba94 Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Mon, 24 Aug 2009 18:03:49 +0000 Subject: [PATCH] Canonical redirect for attachment_id queries that have a permalink. git-svn-id: https://develop.svn.wordpress.org/trunk@11869 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-includes/canonical.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wp-includes/canonical.php b/wp-includes/canonical.php index b604df2ec9..0d890b09d2 100644 --- a/wp-includes/canonical.php +++ b/wp-includes/canonical.php @@ -84,7 +84,10 @@ function redirect_canonical($requested_url=null, $do_redirect=true) { $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 - if ( is_single() && !empty($_GET['p']) && ! $redirect_url ) { + if ( is_attachment() && !empty($_GET['attachment_id']) && ! $redirect_url ) { + if ( $redirect_url = get_attachment_link(get_query_var('attachment_id')) ) + $redirect['query'] = remove_query_arg('attachment_id', $redirect['query']); + } 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']); if ( get_query_var( 'page' ) ) {