WordPress 3.9

[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 449f0e25f95cf2c28bdabb19aec700972d1862fc..03abd2d9dea9299e989ea7b96f4c9b0f4c2ab356 100644 (file)
--- a/wp-includes/js/tinymce/wp-tinymce.php
+++ b/wp-includes/js/tinymce/wp-tinymce.php
@@ -19,7 +19,7 @@ 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('Vary: Accept-Encoding'); // Handle proxies
@@ -32,6 +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');
+       // 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;