jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Define required 'defaults' field in licensing config"
......................................................................
Revert "Define required 'defaults' field in licensing config"
Gergő pointed out in code review on the original patch how it's really
silly that this field is an array when only the first value is used.
Turns out that CampaignSchema actually specifies it as a string,
and will prevent Campaign pages from being saved when it's an array...
On the bright side, that means it was actually impossible to use in
campaigns (when defined as an array, validation would fail and not
save the page; when defined as a string, UploadWizard would throw
exceptions), so we'll be able to correct the code to use it as a string
without breaking changes.
This reverts commit 0c142e5d6c520d45877a822da6d67499396db428.
Bug: T123840
Change-Id: I5006577a163e181d3b73fc4fc8895443ec0cf6d8
(cherry picked from commit beae55e60f236f3ca234f26709ede0e7926195c2)
---
M UploadWizard.config.php
1 file changed, 0 insertions(+), 14 deletions(-)
Approvals:
Dduvall: Looks good to me, approved
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UploadWizard.config.php b/UploadWizard.config.php
index 346b70a..c86e3ef 100644
--- a/UploadWizard.config.php
+++ b/UploadWizard.config.php
@@ -434,13 +434,6 @@
'ownWork' => array(
'type' => 'or',
'template' => 'self',
- 'defaults' => array(
- 'cc-by-sa-4.0',
- 'cc-by-sa-3.0',
- 'cc-by-4.0',
- 'cc-by-3.0',
- 'cc-zero'
- ),
'licenses' => array(
'cc-by-sa-4.0',
'cc-by-sa-3.0',
@@ -453,13 +446,6 @@
// checkbox selection of all licenses
'thirdParty' => array(
'type' => 'or',
- 'defaults' => array(
- 'cc-by-sa-4.0',
- 'cc-by-sa-3.0',
- 'cc-by-4.0',
- 'cc-by-3.0',
- 'cc-zero'
- ),
'licenseGroups' => array(
array(
// This should be a list of all CC
licenses we can reasonably expect to find around the web
--
To view, visit https://gerrit.wikimedia.org/r/264969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5006577a163e181d3b73fc4fc8895443ec0cf6d8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.27.0-wmf.10
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Dduvall <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
