Index: wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js
===================================================================
--- wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js	(revision 19976)
+++ wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js	(working copy)
@@ -1,4 +1,3 @@
-
 (function() {
 	tinymce.create('tinymce.plugins.wpEditImage', {
 
@@ -10,12 +9,13 @@
 
 			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
 			ed.addCommand('WP_EditImage', function() {
-				var el = ed.selection.getNode(), vp = tinymce.DOM.getViewPort(), H = vp.h, W = ( 720 < vp.w ) ? 720 : vp.w, cls = ed.dom.getAttrib(el, 'class');
+				var el = ed.selection.getNode(), vp = tinymce.DOM.getViewPort(), H = vp.h, W = ( 720 < vp.w ) ? 720 : vp.w, cls = ed.dom.getAttrib(el, 'class'), iframeURL;
 
 				if ( cls.indexOf('mceItem') != -1 || cls.indexOf('wpGallery') != -1 || el.nodeName != 'IMG' )
 					return;
 
-				tb_show('', url + '/editimage.html?ver=321&TB_iframe=true');
+				iframeURL = url.replace( /^https?:\/\/[^\/]+/i, document.location.protocol + '//' + document.location.host );
+				tb_show( '', tinymce._addVer( iframeURL + '/editimage.html' ) + '&TB_iframe=true' );
 				tinymce.DOM.setStyles('TB_window', {
 					'width':( W - 50 )+'px',
 					'height':( H - 45 )+'px',