Context Navigation

canonical.php

Timestamp:

08/27/2020 01:35:31 AM (6 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.
Merges [48872] to the 5.5 branch.
Fixes #50910.

Location:

branches/5.5

Files:

-              r48586
+              r48873
+                }
+                // 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' );
 …
                         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'] );
+                        }

Note: See TracChangeset for help on using the changeset viewer.