Changeset 10497 for sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-redirects.php

Timestamp:

12/08/2020 12:22:26 AM (4 years ago)

Author:

dd32

Message:

Redirects: Trim off the sub directory path prefix before attempting to handle malformed urls.

See #5528, #5531.

File:

• sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-redirects.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/mu-plugins/pub/wporg-redirects.php

@@ -119 +119 @@
     }
 
-    $new_path = $path = $_SERVER['REQUEST_URI'];
+    $path = $_SERVER['REQUEST_URI'] ?? '/';
+    // Remove the site prefix.
+    $path = preg_replace( '!^' . preg_quote( wp_parse_url( home_url( '/' ), PHP_URL_PATH ), '!' ) . '!', '/', $path );
+
+    $new_path = $path;
 
     // Remove any common URL paths.
@@ -128 +132 @@
 
     // Remove any trailing punctuation.
-    $new_path = preg_replace( '!([ +\'"\W]|(?:%20))+$!', '', $new_path );
+    $new_path = preg_replace( '!([ +\'"]|(?:%20))+$!', '', $new_path );
 
     if ( $path === $new_path ) {