summaryrefslogtreecommitdiff
path: root/skins/common/upload.js
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
committerPierre Schmitz <pierre@archlinux.de>2013-01-18 16:46:04 +0100
commit63601400e476c6cf43d985f3e7b9864681695ed4 (patch)
treef7846203a952e38aaf66989d0a4702779f549962 /skins/common/upload.js
parent8ff01378c9e0207f9169b81966a51def645b6a51 (diff)
Update to MediaWiki 1.20.2
this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024
Diffstat (limited to 'skins/common/upload.js')
-rw-r--r--skins/common/upload.js19
1 files changed, 13 insertions, 6 deletions
diff --git a/skins/common/upload.js b/skins/common/upload.js
index 8e08af31..df819e19 100644
--- a/skins/common/upload.js
+++ b/skins/common/upload.js
@@ -1,4 +1,4 @@
-( function () {
+( function ( mw, $ ) {
var ajaxUploadDestCheck = mw.config.get( 'wgAjaxUploadDestCheck' ),
fileExtensions = mw.config.get( 'wgFileExtensions' );
@@ -241,10 +241,17 @@ window.fillDestFilename = function(id) {
}
// Output result
- var destFile = document.getElementById('wpDestFile');
- if (destFile) {
- destFile.value = fname;
- wgUploadWarningObj.checkNow(fname) ;
+ var destFile = document.getElementById( 'wpDestFile' );
+ if ( destFile ) {
+ // Call decodeURIComponent function to remove possible URL-encoded characters
+ // from the file name (bug 30390). Especially likely with upload-form-url.
+ // decodeURIComponent can throw an exception in input is invalid utf-8
+ try {
+ destFile.value = decodeURIComponent( fname );
+ } catch ( e ) {
+ destFile.value = fname;
+ }
+ wgUploadWarningObj.checkNow( fname );
}
};
@@ -302,4 +309,4 @@ window.wgUploadLicenseObj = {
$( document ).ready( uploadSetup );
-}() );
+}( mediaWiki, jQuery ) );