Changeset 11590

Timestamp:

06/17/2009 01:08:05 AM (15 years ago)

Author:

azaozz

Message:

Fall back to wp-tinymce.js if wp-tinymce.js.gz doesn't exist

Location:

branches/2.8

Files:

• wp-admin/includes/manifest.php (modified) (1 diff)
• wp-includes/js/tinymce/wp-tinymce.php (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

branches/2.8/wp-admin/includes/manifest.php

@@ -93 +93 @@
     if ( @is_file('../wp-includes/js/tinymce/tiny_mce.js') ) :
     $mce = array(
-        array('../wp-includes/js/tinymce/wp-tinymce.php', 'c=1&' . $mce_ver, true),
-        array('../wp-includes/js/tinymce/wp-tinymce.php', 'c=0&' . $mce_ver, true),
+        array('../wp-includes/js/tinymce/wp-tinymce.php', $mce_ver, true),
 
         array('../wp-includes/js/tinymce/tiny_mce.js', $mce_ver, true),

branches/2.8/wp-includes/js/tinymce/wp-tinymce.php

@@ -9 +9 @@
 
     if ( ! $path || ! @is_file($path) )
-        return '';
+        return false;
 
     return @file_get_contents($path);
@@ -21 +21 @@
 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'] && false !== strpos( strtolower($_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');

branches/2.8/wp-includes/version.php

@@ -30 +30 @@
  * @global string $manifest_version
  */
-$manifest_version = '20090610';
+$manifest_version = '20090616';