jenkins-bot has submitted this change and it was merged.
Change subject: mw.UploadWizardDetails: Don't fail when 'description' is given,
but 'descriptionlang' isn't
......................................................................
mw.UploadWizardDetails: Don't fail when 'description' is given, but
'descriptionlang' isn't
Follow-up to c339bb6e109dc0ee493292c0b91841faff7c033c.
Bug: T121340
Change-Id: I9528e796ee1c3a49492a9c2173a4d0d8df0c3e95
---
M resources/mw.UploadWizardDetails.js
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.UploadWizardDetails.js
b/resources/mw.UploadWizardDetails.js
index 9423dd4..80b88f4 100644
--- a/resources/mw.UploadWizardDetails.js
+++ b/resources/mw.UploadWizardDetails.js
@@ -194,7 +194,9 @@
this.descriptionsDetails.setSerialized( {
descriptions: [
{
- language:
uw.DescriptionDetailsWidget.static.getClosestAllowedLanguage(
uri.query.descriptionlang ),
+ language:
uri.query.descriptionlang ?
+
uw.DescriptionDetailsWidget.static.getClosestAllowedLanguage(
uri.query.descriptionlang ) :
+
uw.DescriptionDetailsWidget.static.getDefaultLanguage(),
description:
mw.UploadWizard.config.defaults.description
}
]
--
To view, visit https://gerrit.wikimedia.org/r/258767
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9528e796ee1c3a49492a9c2173a4d0d8df0c3e95
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
