Installer: use proto-relative URLs for license picker
authorChad Horohoe <chadh@wikimedia.org>
Sun, 24 May 2015 09:49:59 +0000 (11:49 +0200)
committerChad Horohoe <chadh@wikimedia.org>
Sun, 24 May 2015 09:55:23 +0000 (11:55 +0200)
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

index 6e41514..98f3ae8 100644 (file)
@@ -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,