Changeset 43224

Timestamp:

05/10/2018 07:53:18 PM (6 years ago)

Author:

azaozz

Message:

TinyMCE: switch off concatenation when a custom TinyMCE theme is used. Prevents conflict with the default theme as it loads first.

Props programmin, azaozz.
Merges [43222] to the 4.9 branch.
Fixes #43969.

Location:

branches/4.9

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-editor.php (modified) (1 diff)

branches/4.9/src/wp-includes/class-wp-editor.php

@@ -1402 +1402 @@
         $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)