diff --git a/wp-includes/class-wp-editor.php b/wp-includes/class-wp-editor.php index 0743a840fe..298d3edd72 100644 --- a/wp-includes/class-wp-editor.php +++ b/wp-includes/class-wp-editor.php @@ -1401,8 +1401,16 @@ final class _WP_Editors { $version = 'ver=' . $tinymce_version; $baseurl = self::get_baseurl(); - $compressed = $compress_scripts && $concatenate_scripts && isset($_SERVER['HTTP_ACCEPT_ENCODING']) - && false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip'); + $has_custom_theme = false; + foreach ( self::$mce_settings as $init ) { + if ( ! empty( $init['theme_url'] ) ) { + $has_custom_theme = true; + break; + } + } + + $compressed = $compress_scripts && $concatenate_scripts && isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) + && false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip' ) && ! $has_custom_theme; // Load tinymce.js when running from /src, else load wp-tinymce.js.gz (production) or tinymce.min.js (SCRIPT_DEBUG) $mce_suffix = false !== strpos( get_bloginfo( 'version' ), '-src' ) ? '' : '.min'; diff --git a/wp-includes/version.php b/wp-includes/version.php index 0dd94804dd..f206434135 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.9.6-beta1-43221'; +$wp_version = '4.9.6-beta1-43224'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.