X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fobjectcache%2FObjectCache.php;h=cb6249c687c0b441888006f461760cd9f8d66a18;hb=988af574cb66f560f37feb2700a514a2287d445f;hp=6d76d5ed1207739a933e7d7d89789a4e22ba53f1;hpb=55aab97bb4b507911e24995ae870b78f86c17557;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index 6d76d5ed12..cb6249c687 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -154,7 +154,7 @@ class ObjectCache {
 			return $keyspace;
 		}
 
-		return wfWikiID();
+		return WikiMap::getCurrentWikiDomain()->getId();
 	}
 
 	/**
@@ -169,11 +169,7 @@ class ObjectCache {
 	 * @throws InvalidArgumentException
 	 */
 	public static function newFromParams( $params ) {
-		if ( isset( $params['loggroup'] ) ) {
-			$params['logger'] = LoggerFactory::getInstance( $params['loggroup'] );
-		} else {
-			$params['logger'] = LoggerFactory::getInstance( 'objectcache' );
-		}
+		$params['logger'] = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
 		if ( !isset( $params['keyspace'] ) ) {
 			$params['keyspace'] = self::getDefaultKeyspace();
 		}
@@ -340,11 +336,7 @@ class ObjectCache {
 			}
 		}
 		$params['cache'] = self::newFromParams( $params['store'] );
-		if ( isset( $params['loggroup'] ) ) {
-			$params['logger'] = LoggerFactory::getInstance( $params['loggroup'] );
-		} else {
-			$params['logger'] = LoggerFactory::getInstance( 'objectcache' );
-		}
+		$params['logger'] = LoggerFactory::getInstance( $params['loggroup'] ?? 'objectcache' );
 		if ( !$wgCommandLineMode ) {
 			// Send the statsd data post-send on HTTP requests; avoid in CLI mode (T181385)
 			$params['stats'] = $services->getStatsdDataFactory();