From 79de0a4e5aaf111254db02f918414b386833ba73 Mon Sep 17 00:00:00 2001
From: Fomafix <fomafix@googlemail.com>
Date: Fri, 17 May 2019 07:16:16 +0200
Subject: [PATCH] Use HTTPS instead of protocol relative for WMF links

The WMF websites redirect from HTTP to HTTPS.

Change-Id: I916c97697b4ffa9774eec9c8e6ab650a08bb6edd
---
 includes/DefaultSettings.php               | 2 +-
 includes/OutputPage.php                    | 2 +-
 includes/actions/HistoryAction.php         | 5 ++++-
 includes/skins/Skin.php                    | 2 +-
 includes/specials/SpecialImport.php        | 2 +-
 includes/specials/SpecialRecentChanges.php | 2 +-
 resources/src/mediawiki.debug/debug.js     | 2 +-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 28e9ec8f50..69da9c71d9 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3497,7 +3497,7 @@ $wgFooterIcons = [
 			// "$wgResourceBasePath/resources/assets/poweredby_mediawiki_88x31.png"
 			// plus srcset for 1.5x, 2x resolution variants.
 			"src" => null,
-			"url" => "//www.mediawiki.org/",
+			"url" => "https://www.mediawiki.org/",
 			"alt" => "Powered by MediaWiki",
 		]
 	],
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index c45fce7a9d..edffc3bd03 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1478,7 +1478,7 @@ class OutputPage extends ContextSource {
 			$helpUrl = $to;
 		} else {
 			$toUrlencoded = wfUrlencode( str_replace( ' ', '_', $to ) );
-			$helpUrl = "//www.mediawiki.org/wiki/Special:MyLanguage/$toUrlencoded";
+			$helpUrl = "https://www.mediawiki.org/wiki/Special:MyLanguage/$toUrlencoded";
 		}
 
 		$link = Html::rawElement(
diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index 706241adcc..538b0a1233 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -188,7 +188,10 @@ class HistoryAction extends FormlessAction {
 			return;
 		}
 
-		$this->addHelpLink( '//meta.wikimedia.org/wiki/Special:MyLanguage/Help:Page_history', true );
+		$this->addHelpLink(
+			'https://meta.wikimedia.org/wiki/Special:MyLanguage/Help:Page_history',
+			true
+		);
 
 		// Fail nicely if article doesn't exist.
 		if ( !$this->page->exists() ) {
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 86a1c4c94b..7254746b52 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -906,7 +906,7 @@ abstract class Skin extends ContextSource {
 		$url2 = htmlspecialchars(
 			"$resourceBasePath/resources/assets/poweredby_mediawiki_176x62.png"
 		);
-		$text = '<a href="//www.mediawiki.org/"><img src="' . $url1
+		$text = '<a href="https://www.mediawiki.org/"><img src="' . $url1
 			. '" srcset="' . $url1_5 . ' 1.5x, ' . $url2 . ' 2x" '
 			. 'height="31" width="88" alt="Powered by MediaWiki" /></a>';
 		Hooks::run( 'SkinGetPoweredBy', [ &$text, $this ] );
diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index 302a55f62a..c3aec83c18 100644
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -322,7 +322,7 @@ class SpecialImport extends SpecialPage {
 		$action = $this->getPageTitle()->getLocalURL( [ 'action' => 'submit' ] );
 		$user = $this->getUser();
 		$out = $this->getOutput();
-		$this->addHelpLink( '//meta.wikimedia.org/wiki/Special:MyLanguage/Help:Import', true );
+		$this->addHelpLink( 'https://meta.wikimedia.org/wiki/Special:MyLanguage/Help:Import', true );
 
 		if ( $user->isAllowed( 'importupload' ) ) {
 			$mappingSelection = $this->getMappingFormPart( 'upload' );
diff --git a/includes/specials/SpecialRecentChanges.php b/includes/specials/SpecialRecentChanges.php
index 9102f81751..6949c6185c 100644
--- a/includes/specials/SpecialRecentChanges.php
+++ b/includes/specials/SpecialRecentChanges.php
@@ -159,7 +159,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		}
 
 		$this->addHelpLink(
-			'//meta.wikimedia.org/wiki/Special:MyLanguage/Help:Recent_changes',
+			'https://meta.wikimedia.org/wiki/Special:MyLanguage/Help:Recent_changes',
 			true
 		);
 		parent::execute( $subpage );
diff --git a/resources/src/mediawiki.debug/debug.js b/resources/src/mediawiki.debug/debug.js
index 86bc44abf9..a8c7264e27 100644
--- a/resources/src/mediawiki.debug/debug.js
+++ b/resources/src/mediawiki.debug/debug.js
@@ -199,7 +199,7 @@
 			}
 
 			bitDiv( 'mwversion' )
-				.append( $( '<a>' ).attr( 'href', '//www.mediawiki.org/' ).text( 'MediaWiki' ) )
+				.append( $( '<a>' ).attr( 'href', 'https://www.mediawiki.org/' ).text( 'MediaWiki' ) )
 				.append( document.createTextNode( ': ' + this.data.mwVersion + ' ' ) )
 				.append( gitInfo );
 
-- 
2.20.1