WordPress 4.2

[autoinstalls/wordpress.git] / 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 b2ef19d4454276fc3073c5b122423f68d5afce3d..ea58e682d08a0d8499ced9e9f23d5a44923bd65b 100644 (file)
--- a/wp-includes/js/tinymce/wp-tinymce.php
+++ b/wp-includes/js/tinymce/wp-tinymce.php
@@ -2,7 +2,7 @@
 /**
  * Disable error reporting
  *
 /**
  * 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);
 
  */
 error_reporting(0);
 


@@ -19,19 +19,21 @@ function get_file($path) {
        return @file_get_contents($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'])
 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 {
 
        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;
 }
 exit;