From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Mon, 21 Dec 2015 18:22:20 +0000 (+0100)
Subject: mw.ForeignStructuredUpload: Prevent 'null' author name if dialog opened when not... 
X-Git-Tag: 1.31.0-rc.0~8586^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=e1b242337af0dd89b2426af679558203aec376a3;p=lhc%2Fweb%2Fwiklou.git

mw.ForeignStructuredUpload: Prevent 'null' author name if dialog opened when not logged in

Bug: T121097
Change-Id: Ifb178161fabe3adf0a76543a1226eb91adfe1b1d
---

diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
index 768efc3f81..c03c0d1939 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
@@ -197,9 +197,18 @@
 	 * @return {string}
 	 */
 	ForeignStructuredUpload.prototype.getUser = function () {
-		var username = mw.config.get( 'wgUserName' );
-		// Do not localise 'User:', we don't know the language of target wiki
-		return '[[User:' + username + '|' + username + ']]';
+		var username, namespace;
+		// Do not localise, we don't know the language of target wiki
+		namespace = 'User';
+		username = mw.config.get( 'wgUserName' );
+		if ( !username ) {
+			// The user is not logged in locally. However, they might be logged in on the foreign wiki.
+			// We should record their username there. (If they're not logged in there either, this will
+			// record the IP address.) It's also possible that the user opened this dialog, got an error
+			// about not being logged in, logged in in another browser tab, then continued uploading.
+			username = '{{subst:REVISIONUSER}}';
+		}
+		return '[[' + namespace + ':' + username + '|' + username + ']]';
 	};
 
 	mw.ForeignStructuredUpload = ForeignStructuredUpload;