Changeset 58105

Timestamp:

05/06/2024 04:33:27 PM (2 years ago)

Author:

joemcgill

Message:

Options: Update default autoload values used in core.

This updates the values used for the $autoload parameter in various functions to replace 'yes' and 'no' with 'on' and 'off', respectively.

Follow-up to [57920].

Props pbearne, mukesh27, joemcgill.
Fixes #61045. See #42441.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (3 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (1 diff)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-includes/option.php (modified) (4 diffs)
• wp-includes/revision.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (1 diff)

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

@@ -193 +193 @@
                         update_site_option( 'can_compress_scripts', 0 );
                 } else {
-                        update_option( 'can_compress_scripts', 0, 'yes' );
+                        update_option( 'can_compress_scripts', 0, 'on' );
                 }
                 wp_die( 0 );
@@ -232 +232 @@
                                 update_site_option( 'can_compress_scripts', 0 );
                         } else {
-                                update_option( 'can_compress_scripts', 0, 'yes' );
+                                update_option( 'can_compress_scripts', 0, 'on' );
                         }
                 } elseif ( 'yes' === $_GET['test'] ) {
@@ -240 +240 @@
                                 update_site_option( 'can_compress_scripts', 1 );
                         } else {
-                                update_option( 'can_compress_scripts', 1, 'yes' );
+                                update_option( 'can_compress_scripts', 1, 'on' );
                         }
                 }

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -1017 +1017 @@
 
                 // 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 ) {

trunk/src/wp-admin/includes/schema.php

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

trunk/src/wp-includes/option.php

@@ -1413 +1413 @@
 
                 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 );
@@ -1429 +1429 @@
                                 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 {
@@ -2018 +2018 @@
 
         if ( ! is_multisite() ) {
-                $result = add_option( $option, $value, '', 'no' );
+                $result = add_option( $option, $value, '', 'off' );
         } else {
                 $cache_key = "$network_id:$option";
@@ -2264 +2264 @@
 
         if ( ! is_multisite() ) {
-                $result = update_option( $option, $value, 'no' );
+                $result = update_option( $option, $value, 'off' );
         } else {
                 $value = sanitize_option( $option, $value );

trunk/src/wp-includes/revision.php

@@ -1013 +1013 @@
         $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 ) {

trunk/src/wp-includes/taxonomy.php

@@ -4366 +4366 @@
 
         // 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 ) {