diff --git a/Gruntfile.js b/Gruntfile.js
index b25b8dba7a..c877f9fda1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -56,6 +56,7 @@ module.exports = function(grunt) {
'!wp-includes/js/backbone.js',
'!wp-includes/js/underscore.js',
'!wp-includes/js/jquery/jquery.masonry.js',
+ '!wp-includes/js/tinymce/tinymce.js',
'!wp-includes/version.php' // Exclude version.php
],
dest: BUILD_DIR
diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index e4bf5a0890..572ac31182 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -1080,12 +1080,14 @@ final class _WP_Editors {
\n";
} else {
- echo "\n";
+ echo "\n";
echo "\n";
}
diff --git a/src/wp-includes/js/tinymce/wp-tinymce.php b/src/wp-includes/js/tinymce/wp-tinymce.php
index 83a003d720..03abd2d9de 100644
--- a/src/wp-includes/js/tinymce/wp-tinymce.php
+++ b/src/wp-includes/js/tinymce/wp-tinymce.php
@@ -32,7 +32,8 @@ if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODIN
header('Content-Encoding: gzip');
echo $file;
} else {
- echo get_file($basepath . '/tiny_mce.js');
- echo get_file($basepath . '/wp-tinymce-schema.js');
+ // Back compat. This file shouldn't be used if this condition can occur (as in, if gzip isn't accepted).
+ echo get_file( $basepath . '/tinymce.min.js' );
+ echo get_file( $basepath . '/plugins/compat3x/plugin.min.js' );
}
exit;