From 0c4dbbadcaa87a5144799eae8c332226ecd8de79 Mon Sep 17 00:00:00 2001
From: azaozz <azaozz@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Fri, 1 Aug 2008 05:10:27 +0000
Subject: [PATCH] When not using image captions, IE may add caption null, for
 2.7

git-svn-id: http://svn.automattic.com/wordpress/trunk@8517 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/gears-manifest.php                               | 8 ++++----
 wp-includes/js/tinymce/plugins/wpeditimage/editimage.html | 6 +++---
 .../js/tinymce/plugins/wpeditimage/editor_plugin.js       | 2 +-
 .../js/tinymce/plugins/wpeditimage/js/editimage.js        | 2 +-
 wp-includes/js/tinymce/tiny_mce_config.php                | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/wp-admin/gears-manifest.php b/wp-admin/gears-manifest.php
index eccbbb175..30595eaee 100644
--- a/wp-admin/gears-manifest.php
+++ b/wp-admin/gears-manifest.php
@@ -64,7 +64,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 ?>
 {
 "betaManifestVersion" : 1,
-"version" : "<?php echo $man_version; ?>_20080730",
+"version" : "<?php echo $man_version; ?>_20080731",
 "entries" : [
 <?php echo $defaults; ?>
 
@@ -118,7 +118,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311b" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311e" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311f" },
 { "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311b" },
@@ -135,7 +135,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 { "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311b" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311e" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311f" },
 { "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311b" },
 
 { "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311b" },
@@ -148,7 +148,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' );
 { "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311b" },
-{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311e" },
+{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311f" },
 { "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311b" },
 { "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311b" },
 
diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html b/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
index 959a34537..6daee07ca 100644
--- a/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
+++ b/wp-includes/js/tinymce/plugins/wpeditimage/editimage.html
@@ -4,11 +4,11 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <title></title>
 
-<script type="text/javascript" src="js/editimage.js?ver=311e"></script>
+<script type="text/javascript" src="js/editimage.js?ver=311f"></script>
 <script type="text/javascript" src="../../utils/form_utils.js?ver=311b"></script>
 
-<link rel="stylesheet" href="css/editimage.css?ver=311e" type="text/css" media="all" />
-<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=2.6" type="text/css" media="all" />
+<link rel="stylesheet" href="css/editimage.css?ver=311f" type="text/css" media="all" />
+<link rel="stylesheet" href="../../../../../wp-admin/css/media.css?ver=20080709" type="text/css" media="all" />
 <script type="text/javascript">
 if ( 'rtl' == tinyMCEPopup.editor.getParam('directionality','') )
 	document.write('<link rel="stylesheet" href="css/editimage-rtl.css?ver=311b" type="text/css" media="all" />');
diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
index 8ef94f169..f3cdc7494 100644
--- a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
@@ -15,7 +15,7 @@
 				if ( ed.dom.getAttrib(el, 'class').indexOf('mceItem') != -1 || el.nodeName != 'IMG' )
 					return;
 
-				tb_show('', url + '/editimage.html?ver=311e&TB_iframe=true');
+				tb_show('', url + '/editimage.html?ver=311f&TB_iframe=true');
 				tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
 			});
 
diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js b/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js
index 80f5f6356..9534c643b 100644
--- a/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js
+++ b/wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js
@@ -245,7 +245,7 @@ var wpImage = {
 	},
 
 	setup : function() {
-		var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = null;
+		var t = this, h, c, el, id, link, fname, f = document.forms[0], ed = tinyMCEPopup.editor, d = t.I('img_demo'), dom = tinyMCEPopup.dom, DL, caption = '';
 		document.dir = tinyMCEPopup.editor.getParam('directionality','');
 
 		if ( tinyMCEPopup.editor.getParam('wpeditimage_disable_captions', false) )
diff --git a/wp-includes/js/tinymce/tiny_mce_config.php b/wp-includes/js/tinymce/tiny_mce_config.php
index e73cda7c4..f1db92970 100644
--- a/wp-includes/js/tinymce/tiny_mce_config.php
+++ b/wp-includes/js/tinymce/tiny_mce_config.php
@@ -215,7 +215,7 @@ if ( $compress && isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
 // Setup cache info
 if ( $disk_cache ) {
 
-	$cacheKey = apply_filters('tiny_mce_version', '20080730');
+	$cacheKey = apply_filters('tiny_mce_version', '20080731');
 
 	foreach ( $initArray as $v )
 		$cacheKey .= $v;