Changeset 52833

Timestamp:

03/09/2022 03:06:09 PM (3 years ago)

Author:

SergeyBiryukov

Message:

Canonical: Check if the URL scheme exists in strip_fragment_from_url().

This avoids an "Undefined index" PHP notice when a schemeless URI is passed.

Props dd32, SergeyBiryukov.
Fixes #55333.

Location:

trunk

Files:

• src/wp-includes/canonical.php (modified) (1 diff)
• tests/phpunit/tests/canonical/stripFragmentFromUrl.php (added)

trunk/src/wp-includes/canonical.php

@@ -848 +848 @@
  */
 function strip_fragment_from_url( $url ) {
-    $parsed_url = parse_url( $url );
+    $parsed_url = wp_parse_url( $url );
 
     if ( ! empty( $parsed_url['host'] ) ) {
-        // This mirrors code in redirect_canonical(). It does not handle every case.
-        $url = $parsed_url['scheme'] . '://' . $parsed_url['host'];
+        $url = '';
+
+        if ( ! empty( $parsed_url['scheme'] ) ) {
+            $url = $parsed_url['scheme'] . ':';
+        }
+
+        $url .= '//' . $parsed_url['host'];
+
         if ( ! empty( $parsed_url['port'] ) ) {
             $url .= ':' . $parsed_url['port'];