X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/3f5685912e89eb3b0534acd85aa0946b1ca2bbe3..7f1521bf193b382565eb753043c161f4cb3fcda7:/wp-includes/js/tinymce/wp-tinymce.php

diff --git a/wp-includes/js/tinymce/wp-tinymce.php b/wp-includes/js/tinymce/wp-tinymce.php
index b2ef19d4..ea58e682 100644
--- a/wp-includes/js/tinymce/wp-tinymce.php
+++ b/wp-includes/js/tinymce/wp-tinymce.php
@@ -2,7 +2,7 @@
 /**
  * Disable error reporting
  *
- * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
+ * Set this to error_reporting( -1 ) for debugging.
  */
 error_reporting(0);
 
@@ -19,19 +19,21 @@ function get_file($path) {
 	return @file_get_contents($path);
 }
 
-$expires_offset = 31536000;
+$expires_offset = 31536000; // 1 year
 
-header('Content-Type: application/x-javascript; charset=UTF-8');
+header('Content-Type: application/javascript; charset=UTF-8');
 header('Vary: Accept-Encoding'); // Handle proxies
 header('Expires: ' . gmdate( "D, d M Y H:i:s", time() + $expires_offset ) . ' GMT');
 header("Cache-Control: public, max-age=$expires_offset");
 
 if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
-	&& false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
 
 	header('Content-Encoding: gzip');
 	echo $file;
 } else {
-	echo get_file($basepath . '/wp-tinymce.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;