Merge "Use MediaWikiServices::getMainWANObjectCache in ServiceWiring"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 23 Nov 2016 17:29:16 +0000 (17:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 23 Nov 2016 17:29:16 +0000 (17:29 +0000)
includes/ServiceWiring.php

index c2197a6..b958cd4 100644 (file)
@@ -96,7 +96,7 @@ return [
                $config = $services->getMainConfig();
                return new ClassicInterwikiLookup(
                        $wgContLang,
-                       ObjectCache::getMainWANInstance(),
+                       $services->getMainWANObjectCache(),
                        $config->get( 'InterwikiExpiry' ),
                        $config->get( 'InterwikiCache' ),
                        $config->get( 'InterwikiScopes' ),
@@ -238,7 +238,7 @@ return [
        'LinkCache' => function( MediaWikiServices $services ) {
                return new LinkCache(
                        $services->getTitleFormatter(),
-                       ObjectCache::getMainWANInstance()
+                       $services->getMainWANObjectCache()
                );
        },