From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 2 Jan 2012 15:31:28 +0000 (+0000)
Subject: simplify r107833 per CR, just use wfExpandUrl()
X-Git-Tag: 1.31.0-rc.0~25613
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=e5167d224bd3a192b113d834055686cc7aeb622e;p=lhc%2Fweb%2Fwiklou.git

simplify r107833 per CR, just use wfExpandUrl()
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 87eccb4729..9cee0f2ea4 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -192,9 +192,7 @@ if ( $wgUseInstantCommons ) {
 	$wgForeignFileRepos[] = array(
 		'class'                   => 'ForeignAPIRepo',
 		'name'                    => 'wikimediacommons',
-		'apibase'                 => WebRequest::detectProtocol() === 'https' ?
-			'https://commons.wikimedia.org/w/api.php' :
-			'http://commons.wikimedia.org/w/api.php',
+		'apibase'                 => wfExpandUrl( '//commons.wikimedia.org/w/api.php' ),
 		'hashLevels'              => 2,
 		'fetchDescription'        => true,
 		'descriptionCacheExpiry'  => 43200,