Revert r107835 - breaks my wiki "unknown function'
authorNiklas Laxström <nikerabbit@users.mediawiki.org>
Mon, 2 Jan 2012 18:26:09 +0000 (18:26 +0000)
committerNiklas Laxström <nikerabbit@users.mediawiki.org>
Mon, 2 Jan 2012 18:26:09 +0000 (18:26 +0000)
includes/Setup.php

index cd4c99a..5db6b0b 100644 (file)
@@ -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,