Changeset 52395

Timestamp:

12/20/2021 11:51:35 PM (4 years ago)

Author:

hellofromTonya

Message:

Script Loader: Skip getting 'can_compress_scripts' option in script_concat_settings() during install.

When installing a multisite, there is a potential access to a non-existent database table that needs to be skipped to avoid warnings/errors. This fix checks is WordPress is not installing before getting the 'can_compress_scripts' option.

Props schlessera.
Fixes #54634.

File:

• trunk/src/wp-includes/script-loader.php (modified) (3 diffs)

trunk/src/wp-includes/script-loader.php

@@ -2236 +2236 @@
     $compressed_output = ( ini_get( 'zlib.output_compression' ) || 'ob_gzhandler' === ini_get( 'output_handler' ) );
 
+    $can_compress_scripts = ! wp_installing() && get_site_option( 'can_compress_scripts' );
+
     if ( ! isset( $concatenate_scripts ) ) {
         $concatenate_scripts = defined( 'CONCATENATE_SCRIPTS' ) ? CONCATENATE_SCRIPTS : true;
@@ -2245 +2247 @@
     if ( ! isset( $compress_scripts ) ) {
         $compress_scripts = defined( 'COMPRESS_SCRIPTS' ) ? COMPRESS_SCRIPTS : true;
-        if ( $compress_scripts && ( ! get_site_option( 'can_compress_scripts' ) || $compressed_output ) ) {
+        if ( $compress_scripts && ( ! $can_compress_scripts || $compressed_output ) ) {
             $compress_scripts = false;
         }
@@ -2252 +2254 @@
     if ( ! isset( $compress_css ) ) {
         $compress_css = defined( 'COMPRESS_CSS' ) ? COMPRESS_CSS : true;
-        if ( $compress_css && ( ! get_site_option( 'can_compress_scripts' ) || $compressed_output ) ) {
+        if ( $compress_css && ( ! $can_compress_scripts || $compressed_output ) ) {
             $compress_css = false;
         }