Skip to content

Script Loader: Preserve duplicate query variables in enqueued script and style URLs. #11164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
westonruter wants to merge 8 commits into from
+203 −47
Closed

Script Loader: Preserve duplicate query variables in enqueued script and style URLs. #11164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9ac3c9f
Script Loader: Preserve duplicate query variables in enqueued script …
westonruter Mar 5, 2026
04c7126
Use null coalescing operator for '' assignment.
westonruter Mar 5, 2026
15dec30
Refactor version handling to reduce redundancy.
westonruter Mar 5, 2026
9ee6eb7
Use truthy checks for version and added args.
westonruter Mar 5, 2026
84d1ef4
Use explicit empty string checks to preserve '0' query arg.
westonruter Mar 5, 2026
d8a07c1
Refactor regression tests into single methods with data providers.
westonruter Mar 5, 2026
871d8fb
Tests: Add 'false' version cases to duplicate query var data providers.
westonruter Mar 5, 2026
8217f87
Merge branch 'trunk' into trac-64372-bugfix
sirreal Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions src/wp-includes/class-wp-scripts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,19 +417,32 @@ public function do_item( $handle, $group = false ) {
$src = $this->base_url . $src;
}

$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;
$ver_to_add = (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 );

$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;
}
}
$src = add_query_arg( rawurlencode_deep( $query_args ), $src );

/** This filter is documented in wp-includes/class-wp-scripts.php */
$src = esc_url_raw( apply_filters( 'script_loader_src', $src, $handle ) );
Expand Down
29 changes: 21 additions & 8 deletions src/wp-includes/class-wp-styles.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,19 +407,32 @@ public function _css_href( $src, $ver, $handle ) {
$src = $this->base_url . $src;
}

$query_args = array();
$ver_to_add = '';
if ( empty( $ver ) && null !== $ver && is_string( $this->default_version ) ) {
$query_args['ver'] = $this->default_version;
$ver_to_add = $this->default_version;
} elseif ( is_scalar( $ver ) ) {
$query_args['ver'] = (string) $ver;
$ver_to_add = (string) $ver;
}
if ( isset( $this->args[ $handle ] ) ) {
parse_str( $this->args[ $handle ], $parsed_args );
if ( $parsed_args ) {
$query_args = array_merge( $query_args, $parsed_args );

$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;
}
}
$src = add_query_arg( rawurlencode_deep( $query_args ), $src );

/**
* Filters an enqueued style's fully-qualified URL.
Expand Down
Loading
Loading