From: Chad Horohoe <chadh@wikimedia.org>
Date: Sun, 24 May 2015 09:49:59 +0000 (+0200)
Subject: Installer: use proto-relative URLs for license picker
X-Git-Tag: 1.31.0-rc.0~11304
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22lang_raccourcis%22%2C%22module=%24nom_module%22%29%20.%20%22?a=commitdiff_plain;h=2fe90864c122fbb3eaca478fe04cad8b8f6b33ee;p=lhc%2Fweb%2Fwiklou.git

Installer: use proto-relative URLs for license picker

While encouraging HTTPS is nice, you pass styling to the CC picker
and when installing on a non-HTTPS host you end up with mixed
content warnings.

Bug: T100146
Change-Id: Iad706072b1b14b0ce2fb1c1597aae46e8ec15136
---

diff --git a/includes/installer/WebInstallerPage.php b/includes/installer/WebInstallerPage.php
index 6e41514320..98f3ae8a91 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 = 'https://creativecommons.org/license/?' .
+		$iframeUrl = '//creativecommons.org/license/?' .
 			wfArrayToCgi( array(
 				'partner' => 'MediaWiki',
 				'exit_url' => $exitUrl,