dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "tests: Fix broken assertion in ApiQueryAllPagesTest"
[lhc/web/wiklou.git]
/
includes
/
media
/
TransformationalImageHandler.php
diff --git
a/includes/media/TransformationalImageHandler.php
b/includes/media/TransformationalImageHandler.php
index
38dc390
..
95053cf
100644
(file)
--- a/
includes/media/TransformationalImageHandler.php
+++ b/
includes/media/TransformationalImageHandler.php
@@
-26,6
+26,7
@@
* @ingroup Media
*/
use MediaWiki\MediaWikiServices;
* @ingroup Media
*/
use MediaWiki\MediaWikiServices;
+use MediaWiki\Shell\Shell;
/**
* Handler for images that need to be transformed
/**
* Handler for images that need to be transformed
@@
-230,7
+231,7
@@
abstract class TransformationalImageHandler extends ImageHandler {
}
// $scaler will return a MediaTransformError on failure, or false on success.
}
// $scaler will return a MediaTransformError on failure, or false on success.
- // If the scaler is succesful, it will have created a thumbnail at the destination
+ // If the scaler is succes
s
ful, it will have created a thumbnail at the destination
// path.
if ( is_array( $scaler ) && is_callable( $scaler ) ) {
// Allow subclasses to specify their own rendering methods.
// path.
if ( is_array( $scaler ) && is_callable( $scaler ) ) {
// Allow subclasses to specify their own rendering methods.
@@
-517,7
+518,7
@@
abstract class TransformationalImageHandler extends ImageHandler {
function () use ( $method ) {
global $wgImageMagickConvertCommand;
function () use ( $method ) {
global $wgImageMagickConvertCommand;
- $cmd =
wfEscapeShellArg
( $wgImageMagickConvertCommand ) . ' -version';
+ $cmd =
Shell::escape
( $wgImageMagickConvertCommand ) . ' -version';
wfDebug( $method . ": Running convert -version\n" );
$retval = '';
$return = wfShellExecWithStderr( $cmd, $retval );
wfDebug( $method . ": Running convert -version\n" );
$retval = '';
$return = wfShellExecWithStderr( $cmd, $retval );