X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2Fmedia%2FTransformationalImageHandler.php;h=95053cfdbd136645a36f6899403ff468d51f1a9a;hb=9d9b2e385414c4cde629e8745088dfa48a61f12f;hp=38dc3905b952f4fce281d193592f880af1b5ce4a;hpb=8f242b26e7f14aea198cf72f85c42f767bc095af;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 38dc3905b9..95053cfdbd 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -26,6 +26,7 @@
  * @ingroup Media
  */
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Shell\Shell;
 
 /**
  * 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.
-		// If the scaler is succesful, it will have created a thumbnail at the destination
+		// If the scaler is successful, 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.
@@ -517,7 +518,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 			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 );