* 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 c223a25..5dbb6c3 100644 (file)
--- 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 aeb40a3..1add58b 100644 (file)
--- 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'];