From: Gergő Tisza <gtisza@wikimedia.org>
Date: Mon, 15 Jun 2015 22:47:08 +0000 (+0000)
Subject: Fix InstantCommons - HTTP access to Commons does not work anymore
X-Git-Tag: 1.31.0-rc.0~11075^2
X-Git-Url: http://git.cyclocoop.org/data/Luca_Pacioli_%28Gemaelde%29.jpeg?a=commitdiff_plain;h=8517b3cb2276878d11004e2b8bd0a41ce8876134;p=lhc%2Fweb%2Fwiklou.git

Fix InstantCommons - HTTP access to Commons does not work anymore

Bug: T102562
Change-Id: Ie0b4ec179b9ccd13015c9bcbfa5c9917ff26de36
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 70c935d37f..8462f68f2e 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -236,9 +236,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' => 'https://commons.wikimedia.org/w/api.php',
 		'hashLevels' => 2,
 		'fetchDescription' => true,
 		'descriptionCacheExpiry' => 43200,