Changeset 61927 for trunk/src/wp-includes/class-wp-scripts.php

Timestamp:

03/11/2026 01:30:24 AM (2 weeks ago)

Author:

westonruter

Message:

Script Loader: Preserve duplicate URL query params in enqueued scripts and styles.

Previously in r61397, add_query_arg() was used to append versions or handle-specific query arguments. This resulted in stripping any existing duplicate query variables in the source URL (common in Google Fonts URLs). This change refactors WP_Styles::_css_href() and WP_Scripts::do_item() to manually append these parameters to the URL string. This ensures all original query variables are preserved exactly as provided. It also improves fragment handling by ensuring query parameters are inserted before any '#' anchor while maintaining the anchor's presence.

The URL encoding changes in tests/phpunit/tests/dependencies/scripts.php are reversions of what had previously been done in r61397.

Developed in ​https://github.com/WordPress/wordpress-develop/pull/11164

Follow-up to r61397, r61358.

Props westonruter, jonsurrell.
Fixes #64372.

File:

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

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

@@ -418 +418 @@
         }
 
-        $query_args = array();
+        $ver_to_add = '';
         if ( empty( $obj->ver ) && null !== $obj->ver && is_string( $this->default_version ) ) {
-            $query_args['ver'] = $this->default_version;
+            $ver_to_add = $this->default_version;
         } elseif ( is_scalar( $obj->ver ) ) {
-            $query_args['ver'] = (string) $obj->ver;
-        }
-        if ( isset( $this->args[ $handle ] ) ) {
-            parse_str( $this->args[ $handle ], $parsed_args );
-            if ( $parsed_args ) {
-                $query_args = array_merge( $query_args, $parsed_args );
-            }
-        }
-        $src = add_query_arg( rawurlencode_deep( $query_args ), $src );
+            $ver_to_add = (string) $obj->ver;
+        }
+
+        $added_args = (string) ( $this->args[ $handle ] ?? '' );
+
+        if ( '' !== $ver_to_add || '' !== $added_args ) {
+            $fragment = strstr( $src, '#' );
+            if ( false !== $fragment ) {
+                $src = substr( $src, 0, -strlen( $fragment ) );
+            }
+
+            if ( '' !== $ver_to_add ) {
+                $src .= ( str_contains( $src, '?' ) ? '&' : '?' ) . 'ver=' . rawurlencode( $ver_to_add );
+            }
+            if ( '' !== $added_args ) {
+                $src .= ( str_contains( $src, '?' ) ? '&' : '?' ) . $added_args;
+            }
+
+            if ( false !== $fragment ) {
+                $src .= $fragment;
+            }
+        }
 
         /** This filter is documented in wp-includes/class-wp-scripts.php */