Changeset 14700

Timestamp:

03/12/2026 03:30:31 AM (41 hours ago)

Author:

dd32

Message:

Plugin Directory: Fix 404 redirect path parsing to use home_url prefix.

Instead of hardcoded array indices assuming a fixed URL structure, strip the home_url path prefix to get relative path segments.
This makes 404 redirects work correctly in non-production environments.

See ​https://github.com/WordPress/wordpress.org/pull/555

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php (modified) (6 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php

@@ -1446 +1446 @@
         if ( is_404() ) {
 
-            // [1] => plugins [2] => example-plugin-name [3..] => random().
-            $path = explode( '/', trailingslashit( explode( '?', $_SERVER['REQUEST_URI'] )[0] ) );
-
-            if ( 'tags' === $path[2] ) {
-                if ( isset( $path[3] ) && ! empty( $path[3] ) ) {
-                    wp_safe_redirect( home_url( '/search/' . urlencode( $path[3] ) . '/' ), 301 );
+            $path_prefix = wp_parse_url( home_url('/'), PHP_URL_PATH );
+            $path        = substr( $_SERVER['REQUEST_URI'], strlen( $path_prefix ) );
+            // [0] => example-plugin-name [1..] => random().
+            $path        = explode( '/', trailingslashit( explode( '?', $path )[0] ) );
+            $path_base   = $path[0];
+
+            if ( 'tags' === $path_base ) {
+                if ( isset( $path[1] ) && ! empty( $path[1] ) ) {
+                    wp_safe_redirect( home_url( '/search/' . urlencode( $path[1] ) . '/' ), 301 );
                     die();
                 } else {
@@ -1460 +1463 @@
 
             // The about page is now over at /developers/.
-            if ( 'about' === $path[2] ) {
-                if ( isset( $path[3] ) && 'add' == $path[3] ) {
+            if ( 'about' === $path_base ) {
+                if ( isset( $path[1] ) && 'add' == $path[1] ) {
                     wp_safe_redirect( home_url( '/developers/add/' ), 301 );
-                } elseif ( isset( $path[3] ) && 'validator' == $path[3] ) {
+                } elseif ( isset( $path[1] ) && 'validator' == $path[1] ) {
                     wp_safe_redirect( home_url( '/developers/readme-validator/' ), 301 );
                 } else {
@@ -1472 +1475 @@
 
             // Browse 404s.
-            if ( 'browse' === $path[2] ) {
+            if ( 'browse' === $path_base ) {
                 wp_safe_redirect( home_url( '/' ), 301 );
                 die();
@@ -1478 +1481 @@
 
             // The readme.txt page.
-            if ( 'readme.txt' === $path[2] ) {
+            if ( 'readme.txt' === $path_base ) {
                 status_header( 200 );
                 header( 'Content-type: text/plain' );
@@ -1486 +1489 @@
 
             // Handle any plugin redirects.
-            if ( $path[2] && ( $plugin = self::get_plugin_post( $path[2] ) ) ) {
+            if ( $path_base && ( $plugin = self::get_plugin_post( $path_base ) ) ) {
                 $permalink = get_permalink( $plugin->ID );
                 if ( parse_url( $permalink, PHP_URL_PATH ) != $_SERVER['REQUEST_URI'] ) {
@@ -1495 +1498 @@
 
             // Otherwise, let's redirect to the search page.
-            if ( isset( $path[2] ) && ! empty( $path[2] ) ) {
-                wp_safe_redirect( home_url( '/search/' . urlencode( $path[2] ) . '/' ), 301 );
+            if ( isset( $path_base ) && ! empty( $path_base ) ) {
+                wp_safe_redirect( home_url( '/search/' . urlencode( $path_base ) . '/' ), 301 );
                 die();
             }