Changeset 55854

Timestamp:

05/24/2023 05:33:26 PM (3 years ago)

Author:

spacedmonkey

Message:

Options, Meta APIs: Change the option can_compress_scripts to be autoloaded.

Ensure that the option can_compress_scripts is autoloaded on single sites, as this option is used in all requests. This change saves one database query per page request.

Props RavanH, spacedmonkey, costdev, azaozz, flixos90.
Fixes #55270.

Location:

trunk/src

Files:

• wp-admin/includes/ajax-actions.php (modified) (2 diffs)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

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

@@ -189 +189 @@
 
         if ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' === ini_get( 'output_handler' ) ) {
-                update_site_option( 'can_compress_scripts', 0 );
+                // Use `update_option()` on single site to mark the option for autoloading.
+                if ( is_multisite() ) {
+                        update_site_option( 'can_compress_scripts', 0 );
+                } else {
+                        update_option( 'can_compress_scripts', 0, 'yes' );
+                }
                 wp_die( 0 );
         }
@@ -223 +228 @@
                 } elseif ( 'no' === $_GET['test'] ) {
                         check_ajax_referer( 'update_can_compress_scripts' );
-                        update_site_option( 'can_compress_scripts', 0 );
+                        // Use `update_option()` on single site to mark the option for autoloading.
+                        if ( is_multisite() ) {
+                                update_site_option( 'can_compress_scripts', 0 );
+                        } else {
+                                update_option( 'can_compress_scripts', 0, 'yes' );
+                        }
                 } elseif ( 'yes' === $_GET['test'] ) {
                         check_ajax_referer( 'update_can_compress_scripts' );
-                        update_site_option( 'can_compress_scripts', 1 );
+                        // Use `update_option()` on single site to mark the option for autoloading.
+                        if ( is_multisite() ) {
+                                update_site_option( 'can_compress_scripts', 1 );
+                        } else {
+                                update_option( 'can_compress_scripts', 1, 'yes' );
+                        }
                 }
         }

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

@@ -833 +833 @@
         }
 
+        if ( $wp_current_db_version < 55853 ) {
+                upgrade_630();
+        }
+
         maybe_disable_link_manager();
 
@@ -2295 +2299 @@
 
 /**
+ * Executes changes made in WordPress 6.3.0.
+ *
+ * @ignore
+ * @since 6.3.0
+ *
+ * @global int $wp_current_db_version The old (current) database version.
+ */
+function upgrade_630() {
+        global $wp_current_db_version;
+
+        if ( $wp_current_db_version < 55853 ) {
+                if ( ! is_multisite() ) {
+                        // Replace non-autoload option can_compress_scripts with autoload option, see #55270
+                        $can_compress_scripts = get_option( 'can_compress_scripts', false );
+                        if ( false !== $can_compress_scripts ) {
+                                delete_option( 'can_compress_scripts' );
+                                add_option( 'can_compress_scripts', $can_compress_scripts, 'yes' );
+                        }
+                }
+        }
+}
+
+/**
  * Executes network-level upgrade routines.
  *

trunk/src/wp-includes/version.php

@@ -24 +24 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 53496;
+$wp_db_version = 55853;
 
 /**