Changeset 48166

Timestamp:

06/25/2020 11:39:23 AM (6 years ago)

Author:

SergeyBiryukov

Message:

Canonical: Move trailing slash handling for robots.txt and sitemaps to a single condition.

Give the unit test a more descriptive name.

Follow-up to [48153], [48155].

See #48025.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (3 diffs)
• tests/phpunit/tests/canonical/robots.php (modified) (1 diff)
• tests/phpunit/tests/canonical/sitemaps.php (modified) (2 diffs)

trunk/src/wp-includes/canonical.php

@@ -58 +58 @@
         }
 
-        if ( is_admin() || is_search() || is_preview() || is_trackback()
-                || is_favicon() || ( $is_IIS && ! iis7_supports_permalinks() )
+        if ( is_admin() || is_search() || is_preview() || is_trackback() || is_favicon()
+                || ( $is_IIS && ! iis7_supports_permalinks() )
         ) {
                 return;
@@ -656 +656 @@
         }
 
-        // Remove trailing slash for sitemaps requests.
-        if ( ! empty( get_query_var( 'sitemap' ) ) || ! empty( get_query_var( 'sitemap-stylesheet' ) ) ) {
+        // Remove trailing slash for robots.txt or sitemap requests.
+        if ( is_robots()
+                || ! empty( get_query_var( 'sitemap' ) ) || ! empty( get_query_var( 'sitemap-stylesheet' ) )
+        ) {
                 $redirect['path'] = untrailingslashit( $redirect['path'] );
         }
@@ -681 +683 @@
         ) {
                 $redirect['host'] = $original['host'];
-        }
-
-        // Even if the permalink structure ends with a slash, remove slash robots.txt.
-        if ( is_robots() ) {
-                $redirect['path'] = untrailingslashit( $redirect['path'] );
         }
 

trunk/tests/phpunit/tests/canonical/robots.php

@@ -8 +8 @@
 class Tests_Canonical_Robots extends WP_Canonical_UnitTestCase {
 
-        function setUp() {
-                parent::setUp();
-        }
-
-        function test_robots_url() {
-                $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
+        public function test_remove_trailing_slashes_for_robots_requests() {
+                $this->set_permalink_structure( '/%postname%/' );
                 $this->assertCanonical( '/robots.txt', '/robots.txt' );
                 $this->assertCanonical( '/robots.txt/', '/robots.txt' );

trunk/tests/phpunit/tests/canonical/sitemaps.php

@@ -8 +8 @@
  */
 class Tests_Canonical_Sitemaps extends WP_Canonical_UnitTestCase {
+
         public function setUp() {
                 parent::setUp();
@@ -39 +40 @@
                 $this->assertCanonical( '/wp-sitemap.xsl/', '/wp-sitemap.xsl' );
         }
+
 }