Wordpress 3.3

[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 efd2f5985f94ebf165a9b3598dce656b9d354bce..449f0e25f95cf2c28bdabb19aec700972d1862fc 100644 (file)
--- a/wp-includes/js/tinymce/wp-tinymce.php
+++ b/wp-includes/js/tinymce/wp-tinymce.php
@@ -1,4 +1,10 @@
 <?php
 <?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__);
 
 
 $basepath = dirname(__FILE__);
 


@@ -20,10 +26,12 @@ 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");
 
 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') && ( $file = get_file($basepath . '/wp-tinymce.js.gz') ) ) {
+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 $file;
 } else {
        header('Content-Encoding: gzip');
        echo $file;
 } else {

-       echo get_file($basepath . '/wp-tinymce.js');
+       echo get_file($basepath . '/tiny_mce.js');

 }
 exit;
 }
 exit;