From 2fe90864c122fbb3eaca478fe04cad8b8f6b33ee Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Sun, 24 May 2015 11:49:59 +0200 Subject: [PATCH] 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 --- includes/installer/WebInstallerPage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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, -- 2.20.1