From 91a862b1a2c067056d68883f371056bd56ae9f0b Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Mon, 17 Nov 2008 05:51:59 +0000
Subject: [PATCH] Fix thickbox for IE6 in wpeditimage

git-svn-id: https://develop.svn.wordpress.org/trunk@9730 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../js/tinymce/plugins/wpeditimage/editor_plugin.js    | 10 ++++++++--
 wp-includes/script-loader.php                          |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
index b5954ab17d..7c5c00ba75 100644
--- a/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
+++ b/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js
@@ -17,12 +17,18 @@
 
 				tb_show('', url + '/editimage.html?ver=321&TB_iframe=true');
 				tinymce.DOM.setStyles('TB_window', {
-					'top':'20px',
-					'marginTop':'0',
 					'width':( W - 50 )+'px',
 					'height':( H - 45 )+'px',
 					'margin-left':'-'+parseInt((( W - 50 ) / 2),10) + 'px'
 				});
+
+				if ( ! tinymce.isIE6 ) {
+					tinymce.DOM.setStyles('TB_window', {
+						'top':'20px',
+						'marginTop':'0'
+					});
+				}
+
 				tinymce.DOM.setStyles('TB_iframeContent', {
 					'width':( W - 50 )+'px',
 					'height':( H - 75 )+'px'
diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php
index caab2d91b8..23bb7f991b 100644
--- a/wp-includes/script-loader.php
+++ b/wp-includes/script-loader.php
@@ -61,7 +61,7 @@ function wp_default_scripts( &$scripts ) {
 
 	// Modify this version when tinyMCE plugins are changed.
 	function mce_version() {
-		return '20081113';
+		return '20081116';
 	}
 	add_filter( 'tiny_mce_version', 'mce_version' );