Changeset 47761

Timestamp:

05/04/2020 10:47:05 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Canonical: Only redirect non-existing page requests to the post permalink if the post is found.

Follow-up to [47760].

See #45337, #40773, #28081, #11694.

File:

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

trunk/src/wp-includes/canonical.php

@@ -197 +197 @@
             }
 
-            $redirect_url = get_permalink( $post_id );
-
-            $redirect['path']  = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
-            $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+            if ( $post_id ) {
+                $redirect_url = get_permalink( $post_id );
+
+                $redirect['path']  = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
+                $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
+            }
         }