Changeset 55370

Timestamp:

02/21/2023 01:47:57 AM (4 years ago)

Author:

peterwilsoncc

Message:

HTTP API: Add fragment support to WP_Http::make_absolute_url().

Modifies WP_Http::make_absolute_url() to prevent it from dropping URL fragments, this in turn fixes the same issue for links_add_base_url().

Props costdev, sergeybiryukov, dshanske, schlessera, jrf, desrosj, dd32.
Fixes #56231.

Location:

trunk

Files:

• src/wp-includes/class-wp-http.php (modified) (1 diff)
• tests/phpunit/tests/http/http.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-http.php

@@ -1014 +1014 @@
                 }
 
+                // Add the fragment.
+                if ( ! empty( $relative_url_parts['fragment'] ) ) {
+                        $path .= '#' . $relative_url_parts['fragment'];
+                }
+
                 return $absolute_path . '/' . ltrim( $path, '/' );
         }

trunk/tests/phpunit/tests/http/http.php

@@ -10 +10 @@
 
         /**
+         * @ticket 20434
+         * @ticket 56231
+         *
          * @dataProvider make_absolute_url_testcases
          *
@@ -67 +70 @@
                         // Schemeless URL's (not valid in HTTP Headers, but may be used elsewhere).
                         array( '//example.com/sub/', 'https://example.net', 'https://example.com/sub/' ),
+
+                        // URLs with fragments.
+                        array( '/path#frag', 'http://example.org/', 'http://example.org/path#frag' ),
+                        array( '/path/#frag', 'http://example.org/', 'http://example.org/path/#frag' ),
+                        array( '/path#frag&ment=1', 'http://example.org/', 'http://example.org/path#frag&ment=1' ),
+                        array( '/path?query=string#frag', 'http://example.org/', 'http://example.org/path?query=string#frag' ),
+                        array( '/path?query=string%23frag', 'http://example.org/', 'http://example.org/path?query=string%23frag' ),
                 );
         }