From: Steven Roddis <StevenRoddis@users.noreply.github.com>
Date: Wed, 9 Apr 2014 23:19:19 +0000 (+0000)
Subject: installer: Use HTTPS links for licenses
X-Git-Tag: 1.31.0-rc.0~12251^2
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=0ccbe8e8a909fb756b2bc2a5e3b2ad4bc0210514;p=lhc%2Fweb%2Fwiklou.git

installer: Use HTTPS links for licenses

Change-Id: I2c15602e4db2bffea71e46cbd2e48556dc1d829c
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index dc525549d4..1036dcda08 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -285,15 +285,15 @@ abstract class Installer {
 	 */
 	public $licenses = array(
 		'cc-by' => array(
-			'url' => 'http://creativecommons.org/licenses/by/3.0/',
+			'url' => 'https://creativecommons.org/licenses/by/3.0/',
 			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/cc-by.png',
 		),
 		'cc-by-sa' => array(
-			'url' => 'http://creativecommons.org/licenses/by-sa/3.0/',
+			'url' => 'https://creativecommons.org/licenses/by-sa/3.0/',
 			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/cc-by-sa.png',
 		),
 		'cc-by-nc-sa' => array(
-			'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
+			'url' => 'https://creativecommons.org/licenses/by-nc-sa/3.0/',
 			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/cc-by-nc-sa.png',
 		),
 		'cc-0' => array(
@@ -305,7 +305,7 @@ abstract class Installer {
 			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/public-domain.png',
 		),
 		'gfdl' => array(
-			'url' => 'http://www.gnu.org/copyleft/fdl.html',
+			'url' => 'https://www.gnu.org/copyleft/fdl.html',
 			'icon' => '{$wgResourceBasePath}/resources/assets/licenses/gnu-fdl.png',
 		),
 		'none' => array(
diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 038c2bea43..6e41514320 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -1183,7 +1183,7 @@ class WebInstallerOptions extends WebInstallerPage {
 		) );
 		$styleUrl = $server . dirname( dirname( $this->parent->getUrl() ) ) .
 			'/mw-config/config-cc.css';
-		$iframeUrl = 'http://creativecommons.org/license/?' .
+		$iframeUrl = 'https://creativecommons.org/license/?' .
 			wfArrayToCgi( array(
 				'partner' => 'MediaWiki',
 				'exit_url' => $exitUrl,