X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fobjectcache%2FObjectCache.php;h=0a4f0ed3c52773d3f5ecc1d7a297ea153146a114;hp=8160a75ba628c2275cd18163c66573f0ab55cdbf;hb=e758226c91935a1df2b6fd3ed1f18922d8bfb45b;hpb=1d95c68977ef49738eb0fc9c3701afe06467fbeb

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 8160a75ba6..0a4f0ed3c5 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -291,24 +291,6 @@ class ObjectCache {
 		return $cache;
 	}
 
-	/**
-	 * @param array $params [optional] Array key 'fallback' for $fallback.
-	 * @param int|string $fallback Fallback cache, e.g. (CACHE_NONE, "hash") (since 1.24)
-	 * @return BagOStuff
-	 * @deprecated since 1.27
-	 */
-	public static function newAccelerator( $params = [], $fallback = null ) {
-		if ( $fallback === null ) {
-			if ( is_array( $params ) && isset( $params['fallback'] ) ) {
-				$fallback = $params['fallback'];
-			} elseif ( !is_array( $params ) ) {
-				$fallback = $params;
-			}
-		}
-
-		return self::getLocalServerInstance( $fallback );
-	}
-
 	/**
 	 * Create a new cache object of the specified type.
 	 *
@@ -344,9 +326,9 @@ class ObjectCache {
 	 * @throws UnexpectedValueException
 	 */
 	public static function newWANCacheFromParams( array $params ) {
+		$erGroup = MediaWikiServices::getInstance()->getEventRelayerGroup();
 		foreach ( $params['channels'] as $action => $channel ) {
-			$params['relayers'][$action] = MediaWikiServices::getInstance()->getEventRelayerGroup()
-				->getRelayer( $channel );
+			$params['relayers'][$action] = $erGroup->getRelayer( $channel );
 			$params['channels'][$action] = $channel;
 		}
 		$params['cache'] = self::newFromParams( $params['store'] );