X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=e371b5a5c8f54c9850df9d6dad3de7e729efcc67;hb=2c35b5be5f8fc477cdd7e4d832de58de3a6ca3d9;hp=9b064ce703511f8d3e92b83c2b556c08efdacb74;hpb=37f35b5e56808a095aabc823c3cb693b7ef9b6ee;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 9b064ce703..e371b5a5c8 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -102,6 +102,7 @@ return [
 			$config->get( 'EnableDnsBlacklist' ),
 			$config->get( 'ProxyList' ),
 			$config->get( 'ProxyWhitelist' ),
+			$config->get( 'SecretKey' ),
 			$config->get( 'SoftBlockRanges' )
 		);
 	},
@@ -416,13 +417,22 @@ return [
 	},
 
 	'ParserFactory' => function ( MediaWikiServices $services ) : ParserFactory {
-		return new ParserFactory(
+		$options = new ServiceOptions( Parser::$constructorOptions,
+			// 'class' and 'preprocessorClass'
 			$services->getMainConfig()->get( 'ParserConf' ),
+			// Make sure to have defaults in case someone overrode ParserConf with something silly
+			[ 'class' => Parser::class,
+				'preprocessorClass' => Parser::getDefaultPreprocessorClass() ],
+			// Plus a buch of actual config options
+			$services->getMainConfig()
+		);
+
+		return new ParserFactory(
+			$options,
 			$services->getMagicWordFactory(),
 			$services->getContentLanguage(),
 			wfUrlProtocols(),
 			$services->getSpecialPageFactory(),
-			$services->getMainConfig(),
 			$services->getLinkRendererFactory(),
 			$services->getNamespaceInfo()
 		);
@@ -475,8 +485,8 @@ return [
 	'ProxyLookup' => function ( MediaWikiServices $services ) : ProxyLookup {
 		$mainConfig = $services->getMainConfig();
 		return new ProxyLookup(
-			$mainConfig->get( 'SquidServers' ),
-			$mainConfig->get( 'SquidServersNoPurge' )
+			$mainConfig->get( 'CdnServers' ),
+			$mainConfig->get( 'CdnServersNoPurge' )
 		);
 	},