Skip to content

Commit ba88780

Browse files
westonruterwestonruter
committed
Use WP version if ver is empty (including false) but not null
1 parent 624ea26 commit ba88780

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,7 @@ public function do_item( $handle, $group = false ) {
418418
}
419419

420420
$query_args = array();
421-
if ( false === $obj->ver && is_string( $this->default_version ) ) {
421+
if ( empty( $obj->ver ) && null !== $obj->ver && is_string( $this->default_version ) ) {
422422
$query_args['ver'] = $this->default_version;
423423
} elseif ( is_scalar( $obj->ver ) ) {
424424
$query_args['ver'] = (string) $obj->ver;

‎src/wp-includes/class-wp-styles.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -441,7 +441,7 @@ public function _css_href( $src, $ver, $handle ) {
441441
}
442442

443443
$query_args = array();
444-
if ( false === $ver && is_string( $this->default_version ) ) {
444+
if ( empty( $ver ) && null !== $ver && is_string( $this->default_version ) ) {
445445
$query_args['ver'] = $this->default_version;
446446
} elseif ( is_scalar( $ver ) ) {
447447
$query_args['ver'] = (string) $ver;

‎tests/phpunit/tests/dependencies/scripts.php‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4133,6 +4133,7 @@ public function test_wp_scripts_doing_it_wrong_for_missing_dependencies() {
41334133

41344134
/**
41354135
* @ticket 64372
4136+
* @covers WP_Scripts::do_item
41364137
*/
41374138
public function test_varying_versions_with_args_added_to_enqueued_handle() {
41384139
$versions = array(
@@ -4160,17 +4161,17 @@ public function test_varying_versions_with_args_added_to_enqueued_handle() {
41604161
wp_enqueue_script( "register-then-enqueue-qs-{$key}?qs1=q1&qs2=q2" );
41614162
}
41624163

4163-
$markup = get_echo( 'wp_print_scripts' );
4164+
$markup = get_echo( 'wp_print_scripts' );
41644165
$expected = <<<'JS'
41654166
<script type="text/javascript" src="/path/to/qs-string.js?ver=1.0.0&amp;qs1=q1&amp;qs2=q2" id="enqueue-only-string-js"></script>
4166-
<script type="text/javascript" src="/path/to/qs-null.js?ver=qs1=q1&amp;qs2=q2" id="enqueue-only-null-js"></script>
4167+
<script type="text/javascript" src="/path/to/qs-null.js?qs1=q1&amp;qs2=q2" id="enqueue-only-null-js"></script>
41674168
<script type="text/javascript" src="/path/to/qs-false.js?ver=7.0-alpha-61215-src&amp;qs1=q1&amp;qs2=q2" id="enqueue-only-false-js"></script>
41684169
<script type="text/javascript" src="/path/to/qs-empty-string.js?ver=7.0-alpha-61215-src&amp;qs1=q1&amp;qs2=q2" id="enqueue-only-empty-string-js"></script>
41694170
<script type="text/javascript" src="/path/to/qs-integer.js?ver=123&amp;qs1=q1&amp;qs2=q2" id="enqueue-only-integer-js"></script>
41704171
<script type="text/javascript" src="/path/to/qs-float.js?ver=1.23&amp;qs1=q1&amp;qs2=q2" id="enqueue-only-float-js"></script>
41714172
<script type="text/javascript" src="/path/to/qs-zero.js?ver=7.0-alpha-61215-src&amp;qs1=q1&amp;qs2=q2" id="enqueue-only-zero-js"></script>
41724173
<script type="text/javascript" src="/path/to/qs3-string.js?ver=1.0.0&amp;qs1=q1&amp;qs2=q2" id="register-then-enqueue-qs-string-js"></script>
4173-
<script type="text/javascript" src="/path/to/qs3-null.js?ver=qs1=q1&amp;qs2=q2" id="register-then-enqueue-qs-null-js"></script>
4174+
<script type="text/javascript" src="/path/to/qs3-null.js?qs1=q1&amp;qs2=q2" id="register-then-enqueue-qs-null-js"></script>
41744175
<script type="text/javascript" src="/path/to/qs3-false.js?ver=7.0-alpha-61215-src&amp;qs1=q1&amp;qs2=q2" id="register-then-enqueue-qs-false-js"></script>
41754176
<script type="text/javascript" src="/path/to/qs3-empty-string.js?ver=7.0-alpha-61215-src&amp;qs1=q1&amp;qs2=q2" id="register-then-enqueue-qs-empty-string-js"></script>
41764177
<script type="text/javascript" src="/path/to/qs3-integer.js?ver=123&amp;qs1=q1&amp;qs2=q2" id="register-then-enqueue-qs-integer-js"></script>

‎tests/phpunit/tests/dependencies/styles.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -855,6 +855,7 @@ public function test_wp_style_doing_it_wrong_for_missing_dependencies() {
855855

856856
/**
857857
* @ticket 64372
858+
* @covers WP_Styles::do_item
858859
*/
859860
public function test_varying_versions_with_args_added_to_enqueued_handle() {
860861
$versions = array(
@@ -885,14 +886,14 @@ public function test_varying_versions_with_args_added_to_enqueued_handle() {
885886
$markup = get_echo( 'wp_print_styles' );
886887
$expected = <<<'JS'
887888
<link rel='stylesheet' id='enqueue-only-string-css' href='/path/to/qs-string.css?ver=1.0.0&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />
888-
<link rel='stylesheet' id='enqueue-only-null-css' href='/path/to/qs-null.css?ver=qs1=q1&#038;qs2=q2' type='text/css' media='all' />
889+
<link rel='stylesheet' id='enqueue-only-null-css' href='/path/to/qs-null.css?qs1=q1&#038;qs2=q2' type='text/css' media='all' />
889890
<link rel='stylesheet' id='enqueue-only-false-css' href='/path/to/qs-false.css?ver=7.0-alpha-61215-src&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />
890891
<link rel='stylesheet' id='enqueue-only-empty-string-css' href='/path/to/qs-empty-string.css?ver=7.0-alpha-61215-src&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />
891892
<link rel='stylesheet' id='enqueue-only-integer-css' href='/path/to/qs-integer.css?ver=123&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />
892893
<link rel='stylesheet' id='enqueue-only-float-css' href='/path/to/qs-float.css?ver=1.23&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />
893894
<link rel='stylesheet' id='enqueue-only-zero-css' href='/path/to/qs-zero.css?ver=7.0-alpha-61215-src&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />
894895
<link rel='stylesheet' id='register-then-enqueue-qs-string-css' href='/path/to/qs3-string.css?ver=1.0.0&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />
895-
<link rel='stylesheet' id='register-then-enqueue-qs-null-css' href='/path/to/qs3-null.css?ver=qs1=q1&#038;qs2=q2' type='text/css' media='all' />
896+
<link rel='stylesheet' id='register-then-enqueue-qs-null-css' href='/path/to/qs3-null.css?qs1=q1&#038;qs2=q2' type='text/css' media='all' />
896897
<link rel='stylesheet' id='register-then-enqueue-qs-false-css' href='/path/to/qs3-false.css?ver=7.0-alpha-61215-src&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />
897898
<link rel='stylesheet' id='register-then-enqueue-qs-empty-string-css' href='/path/to/qs3-empty-string.css?ver=7.0-alpha-61215-src&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />
898899
<link rel='stylesheet' id='register-then-enqueue-qs-integer-css' href='/path/to/qs3-integer.css?ver=123&#038;qs1=q1&#038;qs2=q2' type='text/css' media='all' />

0 commit comments

Comments
 (0)