Changeset 34643

Timestamp:

09/27/2015 10:10:08 PM (9 years ago)

Author:

wonderboymusic

Message:

Canonical: after [34272], don't redirect rewrite endpoints on attachment URLs when pretty permalinks are enabled.

Fixes #19918.

File:

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

trunk/src/wp-includes/canonical.php

@@ -40 +40 @@
  */
 function redirect_canonical( $requested_url = null, $do_redirect = true ) {
-    global $wp_rewrite, $is_IIS, $wp_query, $wpdb;
+    global $wp_rewrite, $is_IIS, $wp_query, $wpdb, $wp;
 
     if ( isset( $_SERVER['REQUEST_METHOD'] ) && ! in_array( strtoupper( $_SERVER['REQUEST_METHOD'] ), array( 'GET', 'HEAD' ) ) ) {
@@ -158 +158 @@
     } elseif ( is_object($wp_rewrite) && $wp_rewrite->using_permalinks() ) {
         // rewriting of old ?p=X, ?m=2004, ?m=200401, ?m=20040101
-        if ( is_attachment() && ! $redirect_url ) {
+        if ( is_attachment() &&
+            ! array_diff( array_keys( $wp->query_vars ), array( 'attachment', 'attachment_id' ) ) &&
+            ! $redirect_url ) {
             if ( ! empty( $_GET['attachment_id'] ) ) {
                 $redirect_url = get_attachment_link( get_query_var( 'attachment_id' ) );