MaxSem has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/386329 )
Change subject: Switch ServiceWiring to the new execution framework
......................................................................
Switch ServiceWiring to the new execution framework
To test:
$wgMimeDetectorCommand = 'file -bi';
echo MimeMagic::singleton()->guessMimeType('/vagrant/mediawiki/README');
Change-Id: Iaf124901c68292736e5588636f5ec746147f6a54
---
M includes/ServiceWiring.php
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/29/386329/1
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 75ce8ec..2434a0d 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -266,8 +266,14 @@
$detectorCmd = $mainConfig->get( 'MimeDetectorCommand' );
if ( $detectorCmd ) {
- $params['detectCallback'] = function ( $file ) use (
$detectorCmd ) {
- return wfShellExec( "$detectorCmd " .
wfEscapeShellArg( $file ) );
+ $params['detectCallback'] = function ( $file ) use (
$detectorCmd, $services ) {
+ $result = $services->getShellCommandFactory()
+ ->create()
+ // $wgMimeDetectorCommand can contain
commands with parameters
+ ->unsafeParams( $detectorCmd )
+ ->params( $file )
+ ->execute();
+ return $result->getStdout();
};
}
--
To view, visit https://gerrit.wikimedia.org/r/386329
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf124901c68292736e5588636f5ec746147f6a54
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem <maxsem.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
