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

Timestamp:

08/27/2020 01:28:24 AM (5 years ago)

Author:

peterwilsoncc

Message:

Sitemaps: Prevent incorrect redirection of paged sitemap requests.

Update redirect_canonical() to account for custom pagination and URL format used by sitemaps in order to follow standard practices.

Introduce the function get_sitemap_url() to simplify getting the index and provider URLs as needed.

Props jonathanstegall, pbiron, GamerZ, salvoaranzulla, peterwilsoncc.
Fixes #50910.

File:

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

trunk/src/wp-includes/canonical.php

@@ -411 +411 @@
         }
 
-        // Paging and feeds.
-        if ( get_query_var( 'paged' ) || is_feed() || get_query_var( 'cpage' ) ) {
+        if ( get_query_var( 'sitemap' ) ) {
+            $redirect_url      = get_sitemap_url( get_query_var( 'sitemap' ), get_query_var( 'sitemap-subtype' ), get_query_var( 'paged' ) );
+            $redirect['query'] = remove_query_arg( array( 'sitemap', 'sitemap-subtype', 'paged' ), $redirect['query'] );
+        } elseif ( get_query_var( 'paged' ) || is_feed() || get_query_var( 'cpage' ) ) {
+            // Paging and feeds.
             $paged = get_query_var( 'paged' );
             $feed  = get_query_var( 'feed' );
@@ -507 +510 @@
             if ( ! empty( $addl_path ) ) {
                 $redirect['path'] = trailingslashit( $redirect['path'] ) . $addl_path;
-            }
-
-            // Remove trailing slash for sitemaps requests.
-            if ( ! empty( get_query_var( 'sitemap' ) ) ) {
-                $redirect['path'] = untrailingslashit( $redirect['path'] );
             }