jenkins-bot has submitted this change and it was merged.
Change subject: Prevent 'filename-toolong' errors during 'Upload' step
......................................................................
Prevent 'filename-toolong' errors during 'Upload' step
The filename used there is discarded later anyway. If the actual file name
is also too long, the user will get an error and be allowed to correct it
later.
Change-Id: Ifbfe728200e7a0eddc28596efecbeb72d0f5a8fa
---
M resources/transports/mw.FormDataTransport.js
1 file changed, 6 insertions(+), 1 deletion(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/transports/mw.FormDataTransport.js
b/resources/transports/mw.FormDataTransport.js
index 5c57e4a..983d387 100644
--- a/resources/transports/mw.FormDataTransport.js
+++ b/resources/transports/mw.FormDataTransport.js
@@ -126,7 +126,7 @@
* @return {jQuery.Promise}
*/
mw.FormDataTransport.prototype.upload = function ( file ) {
- var formData, deferred,
+ var formData, deferred, ext,
transport = this;
// use timestamp + filename to avoid conflicts on server
@@ -135,6 +135,11 @@
this.tempname = this.tempname.split('').map(function (c) {
return c.charCodeAt(0) > 128 ? '_' : c;
}).join('');
+ // Also limit length to 240 bytes (limit hardcoded in
UploadBase.php).
+ if ( this.tempname.length > 240 ) {
+ ext = this.tempname.split( '.' ).pop();
+ this.tempname = this.tempname.substr( 0, 240 -
ext.length - 1 ) + '.' + ext;
+ }
if ( this.config.enableChunked && file.size > this.chunkSize ) {
return this.uploadChunk( file, 0 );
--
To view, visit https://gerrit.wikimedia.org/r/238451
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbfe728200e7a0eddc28596efecbeb72d0f5a8fa
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: MarkTraceur <mtrac...@member.fsf.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
