From b3b302df3108a51d751fca6d07248af8408e0c8a Mon Sep 17 00:00:00 2001 From: Tonya Mork Date: Mon, 20 Dec 2021 23:51:35 +0000 Subject: [PATCH] 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. git-svn-id: https://develop.svn.wordpress.org/trunk@52395 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/script-loader.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/wp-includes/script-loader.php b/src/wp-includes/script-loader.php index fc34c75180..a15a8fc2db 100644 --- a/src/wp-includes/script-loader.php +++ b/src/wp-includes/script-loader.php @@ -2235,6 +2235,8 @@ function script_concat_settings() { $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; if ( ( ! is_admin() && ! did_action( 'login_init' ) ) || ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) ) { @@ -2244,14 +2246,14 @@ function script_concat_settings() { 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; } } 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; } }