Changeset 49622 for trunk/src/wp-includes/canonical.php

Timestamp:

11/17/2020 03:27:07 AM (4 years ago)

Author:

peterwilsoncc

Message:

Permalinks: Prevent attachment pages 404ing following [49563].

This largely reverts [49563] due to attachment pages returning 404: File not found errors when they use the inherit status.

Permalink changes to attachment pages are retained when they are descendants of trashed or deleted posts.

Props Toro_Unit, helen, johnbillion, peterwilsoncc.
Fixes #51776.
See #5272.

File:

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

trunk/src/wp-includes/canonical.php

@@ -78 +78 @@
     $redirect     = $original;
     $redirect_url = false;
-    $redirect_obj = false;
 
     // Notice fixing.
@@ -104 +103 @@
     if ( is_feed() && $post_id ) {
         $redirect_url = get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
-        $redirect_obj = get_post( $post_id );
 
         if ( $redirect_url ) {
@@ -129 +127 @@
 
             $redirect_url = get_permalink( $post_id );
-            $redirect_obj = get_post( $post_id );
 
             if ( $redirect_url ) {
@@ -154 +151 @@
             if ( $post_type_obj->public && 'auto-draft' !== $redirect_post->post_status ) {
                 $redirect_url = get_permalink( $redirect_post );
-                $redirect_obj = get_post( $redirect_post );
 
                 $redirect['query'] = _remove_qs_args_if_not_in_url(
@@ -202 +198 @@
             if ( $post_id ) {
                 $redirect_url = get_permalink( $post_id );
-                $redirect_obj = get_post( $post_id );
 
                 $redirect['path']  = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
@@ -229 +224 @@
             if ( ! empty( $_GET['attachment_id'] ) ) {
                 $redirect_url = get_attachment_link( get_query_var( 'attachment_id' ) );
-                $redirect_obj = get_post( get_query_var( 'attachment_id' ) );
 
                 if ( $redirect_url ) {
@@ -236 +230 @@
             } else {
                 $redirect_url = get_attachment_link();
-                $redirect_obj = get_post();
             }
         } elseif ( is_single() && ! empty( $_GET['p'] ) && ! $redirect_url ) {
             $redirect_url = get_permalink( get_query_var( 'p' ) );
-            $redirect_obj = get_post( get_query_var( 'p' ) );
 
             if ( $redirect_url ) {
@@ -247 +239 @@
         } elseif ( is_single() && ! empty( $_GET['name'] ) && ! $redirect_url ) {
             $redirect_url = get_permalink( $wp_query->get_queried_object_id() );
-            $redirect_obj = get_post( $wp_query->get_queried_object_id() );
 
             if ( $redirect_url ) {
@@ -254 +245 @@
         } elseif ( is_page() && ! empty( $_GET['page_id'] ) && ! $redirect_url ) {
             $redirect_url = get_permalink( get_query_var( 'page_id' ) );
-            $redirect_obj = get_post( get_query_var( 'page_id' ) );
 
             if ( $redirect_url ) {
@@ -267 +257 @@
         ) {
             $redirect_url = get_permalink( get_option( 'page_for_posts' ) );
-            $redirect_obj = get_post( get_option( 'page_for_posts' ) );
 
             if ( $redirect_url ) {
@@ -322 +311 @@
             ) {
                 $redirect_url = get_author_posts_url( $author->ID, $author->user_nicename );
-                $redirect_obj = $author;
 
                 if ( $redirect_url ) {
@@ -398 +386 @@
                 ) {
                     $redirect_url = get_permalink( $wp_query->get_queried_object_id() );
-                    $redirect_obj = get_post( $wp_query->get_queried_object_id() );
                 }
             }
@@ -409 +396 @@
             if ( ! $redirect_url ) {
                 $redirect_url = get_permalink( get_queried_object_id() );
-                $redirect_obj = get_post( get_queried_object_id() );
             }
 
@@ -755 +741 @@
     }
 
-    if (
-        $redirect_obj &&
-        is_a( $redirect_obj, 'WP_Post' )
-    ) {
-        $post_status_obj = get_post_status_object( get_post_status( $redirect_obj ) );
-        if (
-            // Unviewable post types are never redirected.
-            ! is_post_type_viewable( $redirect_obj->post_type ) ||
-            // Internal or protected posts never redirect.
-            $post_status_obj->internal ||
-            $post_status_obj->protected ||
-            (
-                // Don't redirect a non-public post...
-                ! $post_status_obj->public &&
-                (
-                    // ...unless it's private and the logged in user has access.
-                    $post_status_obj->private &&
-                    ! current_user_can( 'read_post', $redirect_obj->ID )
-                )
-            )
-        ) {
-            $redirect_obj = false;
-            $redirect_url = false;
-        }
-    }
-
     /**
      * Filters the canonical redirect URL.