Skip to content
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

Jump to bottom

Change 'autoload' option values in various files #6417

Closed
wants to merge 6 commits into from
Closed

Change 'autoload' option values in various files #6417

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
67b1c27
Change 'autoload' option values in various files
Apr 19, 2024
b38c788
Update script compression settings in ajax-actions
Apr 23, 2024
659d049
Update autoload parameters in option functions
Apr 25, 2024
aa2a37a
Adjust third argument in update_option() across various scripts
Apr 29, 2024
9d68d77
Adjust third argument in update_option() across various scripts
Apr 29, 2024
7577608
revert of block autoload settings
Apr 30, 2024
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
12 changes: 6 additions & 6 deletions src/wp-admin/includes/ajax-actions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,9 +190,9 @@ function wp_ajax_wp_compression_test() {
if ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' === ini_get( 'output_handler' ) ) {
// Use `update_option()` on single site to mark the option for autoloading.
if ( is_multisite() ) {
update_site_option( 'can_compress_scripts', 0 );
update_site_option( 'can_compress_scripts', 0, 'off' );
pbearne marked this conversation as resolved.
Show resolved Hide resolved
} else {
update_option( 'can_compress_scripts', 0, 'yes' );
update_option( 'can_compress_scripts', 0, 'on' );
}
wp_die( 0 );
}
Expand Down Expand Up @@ -229,17 +229,17 @@ function wp_ajax_wp_compression_test() {
check_ajax_referer( 'update_can_compress_scripts' );
// Use `update_option()` on single site to mark the option for autoloading.
if ( is_multisite() ) {
update_site_option( 'can_compress_scripts', 0 );
update_site_option( 'can_compress_scripts', 0, 'off' );
} else {
update_option( 'can_compress_scripts', 0, 'yes' );
update_option( 'can_compress_scripts', 0, 'on' );
}
} elseif ( 'yes' === $_GET['test'] ) {
check_ajax_referer( 'update_can_compress_scripts' );
// Use `update_option()` on single site to mark the option for autoloading.
if ( is_multisite() ) {
update_site_option( 'can_compress_scripts', 1 );
update_site_option( 'can_compress_scripts', 1, 'off' );
} else {
update_option( 'can_compress_scripts', 1, 'yes' );
update_option( 'can_compress_scripts', 1, 'on' );
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/wp-admin/includes/class-wp-upgrader.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,7 +1016,7 @@ public static function create_lock( $lock_name, $release_timeout = null ) {
$lock_option = $lock_name . '.lock';

// Try to lock.
$lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_option, time() ) );
$lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'off') /* LOCK */", $lock_option, time() ) );

if ( ! $lock_result ) {
$lock_result = get_option( $lock_option );
Expand Down
4 changes: 2 additions & 2 deletions src/wp-admin/includes/schema.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -594,9 +594,9 @@ function populate_options( array $options = array() ) {
}

if ( in_array( $option, $fat_options, true ) ) {
$autoload = 'no';
$autoload = 'off';
} else {
$autoload = 'yes';
$autoload = 'on';
}

if ( ! empty( $insert ) ) {
Expand Down
14 changes: 7 additions & 7 deletions src/wp-includes/option.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,10 +1412,10 @@ function set_transient( $transient, $value, $expiration = 0 ) {
$transient_option = '_transient_' . $transient;

if ( false === get_option( $transient_option ) ) {
$autoload = 'yes';
$autoload = 'on';
if ( $expiration ) {
$autoload = 'no';
add_option( $transient_timeout, time() + $expiration, '', 'no' );
$autoload = 'off';
add_option( $transient_timeout, time() + $expiration, '', 'off' );
}
$result = add_option( $transient_option, $value, '', $autoload );
} else {
Expand All @@ -1428,8 +1428,8 @@ function set_transient( $transient, $value, $expiration = 0 ) {
if ( $expiration ) {
if ( false === get_option( $transient_timeout ) ) {
delete_option( $transient_option );
add_option( $transient_timeout, time() + $expiration, '', 'no' );
$result = add_option( $transient_option, $value, '', 'no' );
add_option( $transient_timeout, time() + $expiration, '', 'off' );
$result = add_option( $transient_option, $value, '', 'off' );
$update = false;
} else {
update_option( $transient_timeout, time() + $expiration );
Expand Down Expand Up @@ -2017,7 +2017,7 @@ function add_network_option( $network_id, $option, $value ) {
$notoptions_key = "$network_id:notoptions";

if ( ! is_multisite() ) {
$result = add_option( $option, $value, '', 'no' );
$result = add_option( $option, $value, '', 'off' );
} else {
$cache_key = "$network_id:$option";

Expand Down Expand Up @@ -2263,7 +2263,7 @@ function update_network_option( $network_id, $option, $value ) {
}

if ( ! is_multisite() ) {
$result = update_option( $option, $value, 'no' );
$result = update_option( $option, $value, 'off' );
} else {
$value = sanitize_option( $option, $value );

Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/revision.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1012,7 +1012,7 @@ function _wp_upgrade_revisions_of_post( $post, $revisions ) {
// Add post option exclusively.
$lock = "revision-upgrade-{$post->ID}";
$now = time();
$result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now ) );
$result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'off') /* LOCK */", $lock, $now ) );

if ( ! $result ) {
// If we couldn't get a lock, see how old the previous lock is.
Expand Down
2 changes: 1 addition & 1 deletion src/wp-includes/taxonomy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4365,7 +4365,7 @@ function _wp_batch_split_terms() {
$lock_name = 'term_split.lock';

// Try to lock.
$lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'no') /* LOCK */", $lock_name, time() ) );
$lock_result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` ( `option_name`, `option_value`, `autoload` ) VALUES (%s, %s, 'off') /* LOCK */", $lock_name, time() ) );

if ( ! $lock_result ) {
$lock_result = get_option( $lock_name );
Expand Down
Loading