Changeset 48470

Timestamp:

07/14/2020 11:41:47 AM (4 years ago)

Author:

swissspidy

Message:

Sitemaps: Pass full paths to home_url() calls.

This makes it easier for plugins using the home_url filter to detect sitemap URLs.

Props Chouby.
Fixes #50592.

Location:

trunk/src/wp-includes/sitemaps

Files:

• class-wp-sitemaps-index.php (modified) (1 diff)
• class-wp-sitemaps-provider.php (modified) (1 diff)
• class-wp-sitemaps-renderer.php (modified) (2 diffs)

trunk/src/wp-includes/sitemaps/class-wp-sitemaps-index.php

@@ -76 +76 @@
 
         if ( ! $wp_rewrite->using_permalinks() ) {
-            return add_query_arg( 'sitemap', 'index', home_url( '/' ) );
+            return home_url( '/?sitemap=index' );
         }
 

trunk/src/wp-includes/sitemaps/class-wp-sitemaps-provider.php

@@ -146 +146 @@
         global $wp_rewrite;
 
-        if ( ! $wp_rewrite->using_permalinks() ) {
-            return add_query_arg(
-                // Accounts for cases where name is not included, ex: sitemaps-users-1.xml.
-                array_filter(
-                    array(
-                        'sitemap'         => $this->name,
-                        'sitemap-subtype' => $name,
-                        'paged'           => $page,
-                    )
-                ),
-                home_url( '/' )
-            );
-        }
+        // Accounts for cases where name is not included, ex: sitemaps-users-1.xml.
+        $params = array_filter(
+            array(
+                'sitemap'         => $this->name,
+                'sitemap-subtype' => $name,
+                'paged'           => $page,
+            )
+        );
 
         $basename = sprintf(
             '/wp-sitemap-%1$s.xml',
-            implode(
-                '-',
-                // Accounts for cases where name is not included, ex: sitemaps-users-1.xml.
-                array_filter(
-                    array(
-                        $this->name,
-                        $name,
-                        (string) $page,
-                    )
-                )
-            )
+            implode( '-', $params )
         );
+
+        if ( ! $wp_rewrite->using_permalinks() ) {
+            $basename = '/?' . http_build_query( $params, null, '&' );
+        }
 
         return home_url( $basename );

trunk/src/wp-includes/sitemaps/class-wp-sitemaps-renderer.php

@@ -68 +68 @@
 
         if ( ! $wp_rewrite->using_permalinks() ) {
-            $sitemap_url = add_query_arg( 'sitemap-stylesheet', 'sitemap', home_url( '/' ) );
+            $sitemap_url = home_url( '/?sitemap-stylesheet=sitemap' );
         }
 
@@ -99 +99 @@
 
         if ( ! $wp_rewrite->using_permalinks() ) {
-            $sitemap_url = add_query_arg( 'sitemap-stylesheet', 'index', home_url( '/' ) );
+            $sitemap_url = home_url( '/?sitemap-stylesheet=index' );
         }