From: Michael Dale <dale@users.mediawiki.org>
Date: Wed, 25 Nov 2009 20:15:44 +0000 (+0000)
Subject: * restored copy-by-url uploads in add-media-wizard per r59320 changes
X-Git-Tag: 1.31.0-rc.0~38710
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=63de706b3aeb1ed35917b9b99440d91b14c3947a;p=lhc%2Fweb%2Fwiklou.git

* restored copy-by-url uploads in add-media-wizard per r59320 changes
---

diff --git a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
index c223a256ea..5dbb6c3c9a 100644
--- a/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
+++ b/js2/mwEmbed/libAddMedia/mvBaseUploadInterface.js
@@ -492,8 +492,8 @@ mvBaseUploadInterface.prototype = {
 			$j( '#up-status-container' ).html(
 				gM( 'mwe-upload-stats-fileprogress',
 					[
-						$mw.lang.formatSize( data.upload['loaded'] ),
-						$mw.lang.formatSize( data.upload['content_length'] )
+						mw.lang.formatSize( data.upload['loaded'] ),
+						mw.lang.formatSize( data.upload['content_length'] )
 					]
 				)
 			);
@@ -504,7 +504,7 @@ mvBaseUploadInterface.prototype = {
 			$j( '#up-status-container' ).html(
 				gM( 'mwe-upload-stats-fileprogress',
 					[
-						$mw.lang.formatSize( data.upload['loaded'] ),
+						mw.lang.formatSize( data.upload['loaded'] ),
 						gM( 'mwe-upload-unknown-size' )
 					]
 				)
diff --git a/js2/mwEmbed/libAddMedia/mvFirefogg.js b/js2/mwEmbed/libAddMedia/mvFirefogg.js
index aeb40a3b1f..1add58bbeb 100644
--- a/js2/mwEmbed/libAddMedia/mvFirefogg.js
+++ b/js2/mwEmbed/libAddMedia/mvFirefogg.js
@@ -819,6 +819,7 @@ mvFirefogg.prototype = { // extends mvBaseUploadInterface
 					//_this.formData[ 'wpIgnoreWarning' ]='true';
 					_this.formData['wpSourceType'] = 'upload';
 					_this.formData['action'] = 'submit';
+					
 					// wpUploadFile is set by firefogg
 					delete _this.formData['file'];