Skip to content

Commit 36ee9bd

Browse files
committed
Options: Fix some default autoload values used in core.
This fixes some autoload values that were updated in [58105] that used the database values of `"on"` and `"off"` instead of the boolean values `true` and `false` when being passed to `add|update_option()`. Props joemcgill, desrosj, rajinsharwar. Fixes #61045. See #42441. git-svn-id: https://develop.svn.wordpress.org/trunk@58416 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 0e7e596 commit 36ee9bd

2 files changed

Lines changed: 10 additions & 10 deletions

File tree

src/wp-admin/includes/ajax-actions.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function wp_ajax_wp_compression_test() {
192192
if ( is_multisite() ) {
193193
update_site_option( 'can_compress_scripts', 0 );
194194
} else {
195-
update_option( 'can_compress_scripts', 0, 'on' );
195+
update_option( 'can_compress_scripts', 0, true );
196196
}
197197
wp_die( 0 );
198198
}
@@ -231,15 +231,15 @@ function wp_ajax_wp_compression_test() {
231231
if ( is_multisite() ) {
232232
update_site_option( 'can_compress_scripts', 0 );
233233
} else {
234-
update_option( 'can_compress_scripts', 0, 'on' );
234+
update_option( 'can_compress_scripts', 0, true );
235235
}
236236
} elseif ( 'yes' === $_GET['test'] ) {
237237
check_ajax_referer( 'update_can_compress_scripts' );
238238
// Use `update_option()` on single site to mark the option for autoloading.
239239
if ( is_multisite() ) {
240240
update_site_option( 'can_compress_scripts', 1 );
241241
} else {
242-
update_option( 'can_compress_scripts', 1, 'on' );
242+
update_option( 'can_compress_scripts', 1, true );
243243
}
244244
}
245245
}

src/wp-includes/option.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1514,10 +1514,10 @@ function set_transient( $transient, $value, $expiration = 0 ) {
15141514
wp_prime_option_caches( array( $transient_option, $transient_timeout ) );
15151515

15161516
if ( false === get_option( $transient_option ) ) {
1517-
$autoload = 'on';
1517+
$autoload = true;
15181518
if ( $expiration ) {
1519-
$autoload = 'off';
1520-
add_option( $transient_timeout, time() + $expiration, '', 'off' );
1519+
$autoload = false;
1520+
add_option( $transient_timeout, time() + $expiration, '', false );
15211521
}
15221522
$result = add_option( $transient_option, $value, '', $autoload );
15231523
} else {
@@ -1530,8 +1530,8 @@ function set_transient( $transient, $value, $expiration = 0 ) {
15301530
if ( $expiration ) {
15311531
if ( false === get_option( $transient_timeout ) ) {
15321532
delete_option( $transient_option );
1533-
add_option( $transient_timeout, time() + $expiration, '', 'off' );
1534-
$result = add_option( $transient_option, $value, '', 'off' );
1533+
add_option( $transient_timeout, time() + $expiration, '', false );
1534+
$result = add_option( $transient_option, $value, '', false );
15351535
$update = false;
15361536
} else {
15371537
update_option( $transient_timeout, time() + $expiration );
@@ -2119,7 +2119,7 @@ function add_network_option( $network_id, $option, $value ) {
21192119
$notoptions_key = "$network_id:notoptions";
21202120

21212121
if ( ! is_multisite() ) {
2122-
$result = add_option( $option, $value, '', 'off' );
2122+
$result = add_option( $option, $value, '', false );
21232123
} else {
21242124
$cache_key = "$network_id:$option";
21252125

@@ -2365,7 +2365,7 @@ function update_network_option( $network_id, $option, $value ) {
23652365
}
23662366

23672367
if ( ! is_multisite() ) {
2368-
$result = update_option( $option, $value, 'off' );
2368+
$result = update_option( $option, $value, false );
23692369
} else {
23702370
$value = sanitize_option( $option, $value );
23712371

0 commit comments

Comments
 (0)