Changeset 48153

Timestamp:

06/23/2020 11:42:36 PM (5 years ago)

Author:

whyisjake

Message:

Canonical: Ensure that when permalinks are set to a trailing slash, that robots.txt doesn't.

Fixes #48025.

Props Toro_Unit, joostdevalk, SergeyBiryukov.

File:

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

trunk/src/wp-includes/canonical.php

@@ -59 +59 @@
 
     if ( is_admin() || is_search() || is_preview() || is_trackback()
-        || is_robots() || is_favicon()
-        || ( $is_IIS && ! iis7_supports_permalinks() )
+        || is_favicon() || ( $is_IIS && ! iis7_supports_permalinks() )
     ) {
         return;
@@ -684 +683 @@
     }
 
+    // Even if the permalink structure ends with a slash, remove slash robots.txt.
+    if ( is_robots() ) {
+        $redirect['path'] = untrailingslashit( $redirect['path'] );
+    }
+
     $compare_original = array( $original['host'], $original['path'] );