X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FServiceWiring.php;h=f97d60df02816ce60d1419fa226140e367f869f0;hb=5bb72fcaf659dd7a44fb9112e32f99e49fd1a318;hp=5131917d945fbd62af129df207574cb16660280d;hpb=8c4400022db5d99b2ee08b610b81df3297b70aaf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 5131917d94..f97d60df02 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -62,7 +62,7 @@ return [
 		$class = MWLBFactory::getLBFactoryClass( $lbConf );
 
 		$instance = new $class( $lbConf );
-		MWLBFactory::setSchemaAliases( $instance );
+		MWLBFactory::setSchemaAliases( $instance, $mainConfig );
 
 		return $instance;
 	},
@@ -286,8 +286,14 @@ return [
 
 		$detectorCmd = $mainConfig->get( 'MimeDetectorCommand' );
 		if ( $detectorCmd ) {
-			$params['detectCallback'] = function ( $file ) use ( $detectorCmd ) {
-				return wfShellExec( "$detectorCmd " . wfEscapeShellArg( $file ) );
+			$factory = $services->getShellCommandFactory();
+			$params['detectCallback'] = function ( $file ) use ( $detectorCmd, $factory ) {
+				$result = $factory->create()
+					// $wgMimeDetectorCommand can contain commands with parameters
+					->unsafeParams( $detectorCmd )
+					->params( $file )
+					->execute();
+				return $result->getStdout();
 			};
 		}
 
@@ -577,7 +583,10 @@ return [
 		$authManager = AuthManager::singleton();
 		$linkRenderer = $services->getLinkRendererFactory()->create();
 		$config = $services->getMainConfig();
-		return new DefaultPreferencesFactory( $config, $wgContLang, $authManager, $linkRenderer );
+		$factory = new DefaultPreferencesFactory( $config, $wgContLang, $authManager, $linkRenderer );
+		$factory->setLogger( LoggerFactory::getInstance( 'preferences' ) );
+
+		return $factory;
 	},
 
 	'HttpRequestFactory' => function ( MediaWikiServices $services ) {