jenkins-bot has submitted this change and it was merged.
Change subject: mw.ForeignStructuredUpload: Prevent 'null' author name if
dialog opened when not logged in
......................................................................
mw.ForeignStructuredUpload: Prevent 'null' author name if dialog opened when
not logged in
Bug: T121097
Change-Id: Ifb178161fabe3adf0a76543a1226eb91adfe1b1d
---
M resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
1 file changed, 12 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, but someone else must approve
Prtksxna: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
index 768efc3..c03c0d1 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;
--
To view, visit https://gerrit.wikimedia.org/r/260402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb178161fabe3adf0a76543a1226eb91adfe1b1d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Edokter <er...@darcoury.nl>
Gerrit-Reviewer: Jack Phoenix <j...@countervandalism.net>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Prtksxna <psax...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
