X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/d3b1ea255664edd2deef17f900a655613d20820d..6c8f14c09105d0afa4c1574215c59b5021040e76:/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 a51eeb7e..83a003d7 100644
--- a/wp-includes/js/tinymce/wp-tinymce.php
+++ b/wp-includes/js/tinymce/wp-tinymce.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Disable error reporting
+ *
+ * Set this to error_reporting( E_ALL ) or error_reporting( E_ALL | E_STRICT ) for debugging
+ */
+error_reporting(0);
 
 $basepath = dirname(__FILE__);
 
@@ -8,22 +14,25 @@ function get_file($path) {
 		$path = realpath($path);
 
 	if ( ! $path || ! @is_file($path) )
-		return '';
+		return false;
 
 	return @file_get_contents($path);
 }
 
-$expires_offset = 31536000;
+$expires_offset = 31536000; // 1 year
 
 header('Content-Type: application/x-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'] && false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') ) {
+if ( isset($_GET['c']) && 1 == $_GET['c'] && isset($_SERVER['HTTP_ACCEPT_ENCODING'])
+	&& false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+
 	header('Content-Encoding: gzip');
-	echo get_file($basepath . '/wp-tinymce.js.gz');
+	echo $file;
 } else {
-	echo get_file($basepath . '/wp-tinymce.js');
+	echo get_file($basepath . '/tiny_mce.js');
+	echo get_file($basepath . '/wp-tinymce-schema.js');
 }
 exit;