From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 24 Oct 2016 04:01:03 +0000 (-0700)
Subject: Clean up newWANCacheFromParams() getInstance() calls
X-Git-Tag: 1.31.0-rc.0~5036^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/supprimer.php?a=commitdiff_plain;h=f19a4a156659a246c6377505eb12ca8888eb55d0;p=lhc%2Fweb%2Fwiklou.git

Clean up newWANCacheFromParams() getInstance() calls

Change-Id: I0daa2531708d0a110e8028c4a5641153a23c0a97
---

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 53a474b6e3..0a4f0ed3c5 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -326,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'] );