diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index fc34c75180..a15a8fc2db 100644 --- a/wp-includes/script-loader.php +++ b/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; } } diff --git a/wp-includes/version.php b/wp-includes/version.php index 0e4674ab7f..ad65913c27 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '5.9-beta3-52394'; +$wp_version = '5.9-beta3-52395'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.