Merge "Document WAN cache FLD_* constants"

[lhc/web/wiklou.git] / includes / objectcache / ObjectCache.php

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index e9f2211..24846e6 100644 (file)
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -22,6 +22,7 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
 
 /**
  * Functions to get cache objects
@@ -299,7 +300,8 @@ class ObjectCache {
 
                $params = $wgWANObjectCaches[$id];
                foreach ( $params['channels'] as $action => $channel ) {
-                       $params['relayers'][$action] = EventRelayerGroup::singleton()->getRelayer( $channel );
+                       $params['relayers'][$action] = MediaWikiServices::getInstance()->getEventRelayerGroup()
+                               ->getRelayer( $channel );
                        $params['channels'][$action] = $channel;
                }
                $params['cache'] = self::newFromId( $params['cacheId'] );