From: Derk-Jan Hartman <hartman@videolan.org>
Date: Tue, 31 Jul 2012 21:06:51 +0000 (+0200)
Subject: (bug 31644) [MERGE DEPENDENCY] Let WikiMap url builders return full urls instead... 
X-Git-Tag: 1.31.0-rc.0~22900
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=dbc563169b40c3df056a1b48326f045b4b27d144;p=lhc%2Fweb%2Fwiklou.git

(bug 31644) [MERGE DEPENDENCY] Let WikiMap url builders return full urls instead of canonical urls

* This commit depends on a commit of globalusage https://gerrit.wikimedia.org/r/17117
* This allows GlobalUsage, CentralAuth and AbuseLog extensions to use protocol relative URLs.

Change-Id: I7e65bd029f359c36770aa48e6663f26a671b92c0
---

diff --git a/RELEASE-NOTES-1.20 b/RELEASE-NOTES-1.20
index 9383bf270f..19a4fedc18 100644
--- a/RELEASE-NOTES-1.20
+++ b/RELEASE-NOTES-1.20
@@ -176,6 +176,8 @@ upgrade PHP if you have not done so prior to upgrading MediaWiki.
 * (bug 38093) Gender of changed user groups missing in Special:Log/rights
 * (bug 35893) Special:Block needs to load mediawiki.special.block.js.
 * (bug 37331) ResourceLoader modules sometimes execute twice in Firefox
+* (bug 31644) GlobalUsage, CentralAuth and AbuseLog extensions should not use
+  insecure links to foreign wikis in the WikiMap.
 
 === API changes in 1.20 ===
 * (bug 34316) Add ability to retrieve maximum upload size from MediaWiki API.
diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index 7dd85b6a0f..4a5e2bcfb6 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -109,7 +109,7 @@ class WikiMap {
 		$wiki = WikiMap::getWiki( $wikiID );
 
 		if ( $wiki ) {
-			return $wiki->getUrl( $page );
+			return $wiki->getFullUrl( $page );
 		}
 
 		return false;