Changeset 7270 for trunk/wp-includes/js/tinymce/tiny_mce_config.php

Timestamp:

03/12/2008 10:47:11 PM (19 years ago)

Author:

ryan

Message:

TinyMCE 3.05 from azaozz. fixes #6195

File:

• trunk/wp-includes/js/tinymce/tiny_mce_config.php (modified) (4 diffs)

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -167 +167 @@
 unset( $initArray['disk_cache'], $initArray['compress'], $initArray['old_cache_max'] );
 
-$isIE5 = ( ( $msie = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') ) && ( (int) substr( $_SERVER['HTTP_USER_AGENT'], $msie + 5, 3 ) < 6 ) ) ? true : false;
-if ( $isIE5 ) $compress = false;
+// Anybody still using IE5/5.5? It can't handle gzip compressed js well.
+if ( $msie = strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') ) {
+        $ie_ver = (int) substr( $_SERVER['HTTP_USER_AGENT'] , $msie + 5, 3 );
+        if ( $ie_ver && $ie_ver < 6 ) $compress = false;
+}
 
 // Cache path, this is where the .gz files will be stored
@@ -182 +185 @@
 $enc = $cacheKey = $suffix = $mce_options = ''; 
 
-// Check if supports gzip
+// Check if browser supports gzip
 if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
         $encodings = explode( ',', strtolower( preg_replace('/\s+/', '', $_SERVER['HTTP_ACCEPT_ENCODING']) ) );
 
-        if ( (in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------']) ) && function_exists('ob_gzhandler') && !ini_get('zlib.output_compression') ) {
+        if ( (in_array('gzip', $encodings) || in_array('x-gzip', $encodings) || isset($_SERVER['---------------']) ) && function_exists('ob_gzhandler') && (ini_get('zlib.output_compression') == false) ) {
                 $enc = in_array('x-gzip', $encodings) ? 'x-gzip' : 'gzip';
                 $cache_ext = '.gz';
@@ -258 +261 @@
 // Write file
 if ( '' != $cacheKey ) {
-        if ( (int) $old_cache_max && is_dir($cache_path) ) {            
+        if ( is_dir($cache_path) ) {            
 
                 $old_cache = array();
@@ -270 +273 @@
                         
                 krsort($old_cache);
-                if ( 1 >= $old_cache_max ) $del_cache = $old_cache;
+                if ( 1 >= (int) $old_cache_max ) $del_cache = $old_cache;
                 else $del_cache = array_slice( $old_cache, ($old_cache_max - 1) );