jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Flickr: The community does not consider UW uploads
verified"
......................................................................
Revert "Flickr: The community does not consider UW uploads verified"
While there is technically an issue here, editing a JS file is not the solution.
This reverts commit 1f99cedfeb3ab8ae68b89fc9f2a83e157732b9a6.
Change-Id: Idaab64a3a0e230be335ea505d942930528800037
(cherry picked from commit 60618e80d8734179649a62c8e9156e5f0e1c5000)
---
M resources/mw.FlickrChecker.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.FlickrChecker.js b/resources/mw.FlickrChecker.js
index e82476f..8542dd0 100644
--- a/resources/mw.FlickrChecker.js
+++ b/resources/mw.FlickrChecker.js
@@ -34,14 +34,14 @@
// Live list at
http://api.flickr.com/services/rest/?&method=flickr.photos.licenses.getInfo&api_key=...
licenseMaps: {
'All Rights Reserved': 'invalid',
- 'Attribution License':
'{{FlickrByUploadWizard|cc-by-2.0}}{{flickrreview}}{{cc-by-2.0}}',
+ 'Attribution License':
'{{FlickrVerifiedByUploadWizard|cc-by-2.0}}{{cc-by-2.0}}',
'Attribution-NoDerivs License': 'invalid',
'Attribution-NonCommercial-NoDerivs License': 'invalid',
'Attribution-NonCommercial License': 'invalid',
'Attribution-NonCommercial-ShareAlike License':
'invalid',
- 'Attribution-ShareAlike License':
'{{FlickrByUploadWizard|cc-by-sa-2.0}}{{flickrreview}}{{cc-by-sa-2.0}}',
- 'No known copyright restrictions':
'{{FlickrByUploadWizard|Flickr-no known copyright
restrictions}}{{flickrreview}}{{Flickr-no known copyright restrictions}}',
- 'United States Government Work':
'{{FlickrByUploadWizard|PD-USGov}}{{flickrreview}}{{PD-USGov}}'
+ 'Attribution-ShareAlike License':
'{{FlickrVerifiedByUploadWizard|cc-by-sa-2.0}}{{cc-by-sa-2.0}}',
+ 'No known copyright restrictions':
'{{FlickrVerifiedByUploadWizard|Flickr-no known copyright
restrictions}}{{Flickr-no known copyright restrictions}}',
+ 'United States Government Work':
'{{FlickrVerifiedByUploadWizard|PD-USGov}}{{PD-USGov}}'
},
/**
--
To view, visit https://gerrit.wikimedia.org/r/189496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idaab64a3a0e230be335ea505d942930528800037
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: wmf/1.25wmf16
Gerrit-Owner: MarkTraceur <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
