From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Tue, 20 Oct 2015 21:55:56 +0000 (+0200)
Subject: mediawiki.Upload: Don't choke on nameless or dateless files
X-Git-Tag: 1.31.0-rc.0~9327^2
X-Git-Url: http://git.cyclocoop.org/%27%20.%20url_absolue%28%24favicon%29%20.%20?a=commitdiff_plain;h=663629ce78ab9b0a3fd93820b5eb2b98046f6c3b;p=lhc%2Fweb%2Fwiklou.git

mediawiki.Upload: Don't choke on nameless or dateless files

Bug: T116073
Change-Id: I5919f1457b019ebc913beeb458ee3c6290223cfe
---

diff --git a/resources/src/mediawiki/mediawiki.Upload.js b/resources/src/mediawiki/mediawiki.Upload.js
index 1432912198..4f8789de7a 100644
--- a/resources/src/mediawiki/mediawiki.Upload.js
+++ b/resources/src/mediawiki/mediawiki.Upload.js
@@ -85,12 +85,18 @@
 	 */
 	UP.setFilenameFromFile = function () {
 		var file = this.getFile();
+		if ( !file ) {
+			return;
+		}
 		if ( file.nodeType && file.nodeType === Node.ELEMENT_NODE ) {
 			// File input element, use getBasename to cut out the path
 			this.setFilename( this.getBasename( file.value ) );
-		} else if ( file.name && file.lastModified ) {
+		} else if ( file.name ) {
 			// HTML5 FileAPI File object, but use getBasename to be safe
 			this.setFilename( this.getBasename( file.name ) );
+		} else {
+			// If we ever implement uploading files from clipboard, they might not have a name
+			this.setFilename( '?' );
 		}
 	};