From b950c0e8eaaa35ce4bf9f1dc0f73964e469f80b1 Mon Sep 17 00:00:00 2001 From: Fomafix Date: Fri, 14 Jun 2019 11:26:40 +0200 Subject: [PATCH] Use HTTPS for creativecommons.org http://creativecommons.org/ redirects to https://creativecommons.org/ Change-Id: I625a09b32a30df2043620c0ce0756b2a963ba0c7 --- includes/installer/WebInstallerOptions.php | 2 +- languages/i18n/exif/qqq.json | 2 +- resources/src/jquery/jquery.makeCollapsible.js | 2 +- tests/phpunit/maintenance/categoriesRdfTest.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/installer/WebInstallerOptions.php b/includes/installer/WebInstallerOptions.php index bc2517955a..2412319ea3 100644 --- a/includes/installer/WebInstallerOptions.php +++ b/includes/installer/WebInstallerOptions.php @@ -364,7 +364,7 @@ class WebInstallerOptions extends WebInstallerPage { ] ); $styleUrl = $server . dirname( dirname( $this->parent->getUrl() ) ) . '/mw-config/config-cc.css'; - $iframeUrl = '//creativecommons.org/license/?' . + $iframeUrl = 'https://creativecommons.org/license/?' . wfArrayToCgi( [ 'partner' => 'MediaWiki', 'exit_url' => $exitUrl, diff --git a/languages/i18n/exif/qqq.json b/languages/i18n/exif/qqq.json index 6eac350ead..c9afaa9f61 100644 --- a/languages/i18n/exif/qqq.json +++ b/languages/i18n/exif/qqq.json @@ -364,7 +364,7 @@ "exif-copyrighted": "Copyright status. This is a true or false field showing either Copyrighted or Public Domain. It should be noted that Copyrighted includes freely-licensed works.", "exif-copyrightowner": "{{exif-qqq}}\n\nCopyright owner. Can have more than one person or entity.", "exif-usageterms": "Terms under which you're allowed to use the image/media.", - "exif-webstatement": "{{exif-qqq}}\n\nURL detailing the copyright status of the image, and how you're allowed to use the image. Often this is a link to a creative commons license, however the creative commons people recommend using a page that generally contains specific information about the image, and recommend using {{msg-mw|exif-licenseurl}} for linking to the license. See http://wiki.creativecommons.org/XMP", + "exif-webstatement": "{{exif-qqq}}\n\nURL detailing the copyright status of the image, and how you're allowed to use the image. Often this is a link to a creative commons license, however the creative commons people recommend using a page that generally contains specific information about the image, and recommend using {{msg-mw|exif-licenseurl}} for linking to the license. See https://wiki.creativecommons.org/wiki/XMP", "exif-originaldocumentid": "A unique ID of the original document (image) that this document (image) is based on.", "exif-licenseurl": "{{exif-qqq}}\n\nURL for copyright license. This is almost always a creative commons license since this information comes from the creative commons namespace of XMP (but could be a link to any type of license). See also {{msg-mw|exif-webstatement}}", "exif-morepermissionsurl": "A URL where you can \"buy\" (or otherwise negotiate) to get more rights for the image.", diff --git a/resources/src/jquery/jquery.makeCollapsible.js b/resources/src/jquery/jquery.makeCollapsible.js index 09306f634c..3e4081ad1e 100644 --- a/resources/src/jquery/jquery.makeCollapsible.js +++ b/resources/src/jquery/jquery.makeCollapsible.js @@ -5,7 +5,7 @@ * familiarise yourself with that CSS before making any changes to this code. * * Dual licensed: - * - CC BY 3.0 + * - CC BY 3.0 * - GPL2 * * @class jQuery.plugin.makeCollapsible diff --git a/tests/phpunit/maintenance/categoriesRdfTest.php b/tests/phpunit/maintenance/categoriesRdfTest.php index 5068e7011f..be38affc5a 100644 --- a/tests/phpunit/maintenance/categoriesRdfTest.php +++ b/tests/phpunit/maintenance/categoriesRdfTest.php @@ -58,7 +58,7 @@ class CategoriesRdfTest extends MediaWikiLangTestCase { 'wgServer' => 'http://acme.test', 'wgCanonicalServer' => 'http://acme.test', 'wgArticlePath' => '/wiki/$1', - 'wgRightsUrl' => '//creativecommons.org/licenses/by-sa/3.0/', + 'wgRightsUrl' => 'https://creativecommons.org/licenses/by-sa/3.0/', ] ); $dumpScript = -- 2.20.1