Changeset 34272

Timestamp:

09/17/2015 09:31:21 PM (9 years ago)

Author:

wonderboymusic

Message:

Canonical: redirect URLs that match an attachment masked on the wrong URL to the attachment link for the matched attachment.

Props solarissmoke.
Fixes #19918.

File:

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

trunk/src/wp-includes/canonical.php

@@ -151 +151 @@
     } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
         // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
-        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']);
+        if ( is_attachment() && ! $redirect_url ) {
+            if ( ! empty( $_GET['attachment_id'] ) ) {
+                $redirect_url = get_attachment_link( get_query_var( 'attachment_id' ) );
+                if ( $redirect_url ) {
+                    $redirect['query'] = remove_query_arg( 'attachment_id', $redirect['query'] );
+                }
+            } else {
+                $redirect_url = get_attachment_link();
+            }
         } elseif ( is_single() && !empty($_GET['p']) && ! $redirect_url ) {
             if ( $redirect_url = get_permalink(get_query_var('p')) )