From 8502dc048778ba87c9a07102a51c67718a4eee21 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 17 Jun 2009 01:06:32 +0000
Subject: [PATCH] Fall back to wp-tinymce.js if wp-tinymce.js.gz doesn't exist

git-svn-id: http://svn.automattic.com/wordpress/trunk@11589 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/manifest.php        | 3 +--
 wp-includes/js/tinymce/wp-tinymce.php | 6 +++---
 wp-includes/version.php               | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/wp-admin/includes/manifest.php b/wp-admin/includes/manifest.php
index bdff9fd42..6b763df45 100644
--- a/wp-admin/includes/manifest.php
+++ b/wp-admin/includes/manifest.php
@@ -92,8 +92,7 @@ function &get_manifest() {
 
 	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),
 		array('../wp-includes/js/tinymce/langs/wp-langs-en.js', $mce_ver, true),
diff --git a/wp-includes/js/tinymce/wp-tinymce.php b/wp-includes/js/tinymce/wp-tinymce.php
index a51eeb7ec..efd2f5985 100644
--- a/wp-includes/js/tinymce/wp-tinymce.php
+++ b/wp-includes/js/tinymce/wp-tinymce.php
@@ -8,7 +8,7 @@ function get_file($path) {
 		$path = realpath($path);
 
 	if ( ! $path || ! @is_file($path) )
-		return '';
+		return false;
 
 	return @file_get_contents($path);
 }
@@ -20,9 +20,9 @@ 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'] && 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');
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 4d033d928..76e92e6cd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -29,4 +29,4 @@ $tinymce_version = '3241-1141';
  *
  * @global string $manifest_version
  */
-$manifest_version = '20090610';
+$manifest_version = '20090616';