From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Mon, 2 Jan 2012 18:26:09 +0000 (+0000)
Subject: Revert r107835 - breaks my wiki "unknown function'
X-Git-Tag: 1.31.0-rc.0~25607
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=63407b7112b2385b04feb8ec6b640a82c124ee9b;p=lhc%2Fweb%2Fwiklou.git

Revert r107835 - breaks my wiki "unknown function'
---

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