X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=maintenance%2FrebuildLocalisationCache.php;h=4213d5f85d9f97405ea74b7dcfb7348f6d406dea;hp=a239fa0e28a8683f3a9b3bb4f8ac837d358023c1;hb=8e0ef3e187b4b8ebe847dbc8ae1ec2b96ed58ae0;hpb=4a8fd65caa0d3919d1917920a9d11f8d9355574d

diff --git a/maintenance/rebuildLocalisationCache.php b/maintenance/rebuildLocalisationCache.php
index a239fa0e28..4213d5f85d 100644
--- a/maintenance/rebuildLocalisationCache.php
+++ b/maintenance/rebuildLocalisationCache.php
@@ -29,10 +29,6 @@
  * @ingroup Maintenance
  */
 
-use MediaWiki\Config\ServiceOptions;
-use MediaWiki\Logger\LoggerFactory;
-use MediaWiki\MediaWikiServices;
-
 require_once __DIR__ . '/Maintenance.php';
 
 /**
@@ -81,25 +77,13 @@ class RebuildLocalisationCache extends Maintenance {
 
 		$conf = $wgLocalisationCacheConf;
 		$conf['manualRecache'] = false; // Allow fallbacks to create CDB files
-		$conf['forceRecache'] = $force || !empty( $conf['forceRecache'] );
+		if ( $force ) {
+			$conf['forceRecache'] = true;
+		}
 		if ( $this->hasOption( 'outdir' ) ) {
 			$conf['storeDirectory'] = $this->getOption( 'outdir' );
 		}
-		// XXX Copy-pasted from ServiceWiring.php. Do we need a factory for this one caller?
-		$lc = new LocalisationCacheBulkLoad(
-			new ServiceOptions(
-				LocalisationCache::$constructorOptions,
-				$conf,
-				MediaWikiServices::getInstance()->getMainConfig()
-			),
-			new LCStoreDB( [] ),
-			LoggerFactory::getInstance( 'localisation' ),
-			[ function () {
-				MediaWikiServices::getInstance()->getResourceLoader()
-					->getMessageBlobStore()->clear();
-			} ],
-			MediaWikiServices::getInstance()->getLanguageNameUtils()
-		);
+		$lc = new LocalisationCacheBulkLoad( $conf );
 
 		$allCodes = array_keys( Language::fetchLanguageNames( null, 'mwfile' ) );
 		if ( $this->hasOption( 'lang' ) ) {