Changeset 60496

Timestamp:

07/22/2025 04:23:35 PM (3 months ago)

Author:

johnjamesjacoby

Message:

Canonical: prevent possible "Undefined array key" PHP error in redirect_canonical(), if the path or query array keys have gone missing.

This commit checks for the existence of (and re-adds if necessary) the path and query array keys after the $redirect variable has potentially been replaced by a second call to parse_url().

This may happen when redirecting back to the root domain, without any path ('/example/) or query (?example=1`) to parse.

Props chrismattix, dhruvang21.

Fixes #63733.

File:

• trunk/src/wp-includes/canonical.php (modified) (1 diff)

trunk/src/wp-includes/canonical.php

@@ -614 +614 @@
     } else {
         unset( $redirect['port'] );
+    }
+
+    // Notice prevention after new parse_url( $redirect_url ) calls
+    if ( ! isset( $redirect['path'] ) ) {
+        $redirect['path'] = '';
+    }
+    if ( ! isset( $redirect['query'] ) ) {
+        $redirect['query'] = '';
     }