From e1b242337af0dd89b2426af679558203aec376a3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 21 Dec 2015 19:22:20 +0100 Subject: [PATCH] mw.ForeignStructuredUpload: Prevent 'null' author name if dialog opened when not logged in Bug: T121097 Change-Id: Ifb178161fabe3adf0a76543a1226eb91adfe1b1d --- .../mediawiki.ForeignStructuredUpload.js | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) 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; -- 2.20.1