X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fmedia%2FTransformationalImageHandler.php;h=2a74e0d7084bd55d83ee00683f3abe05dfe4f227;hb=e7b50493c10f05508ed991ffc9a9179c55bcfbf4;hp=60aec45729852c5218fa449b5bc106a2013de73e;hpb=c253b03fe5799331d34f390d426bd58d20fc50d6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/TransformationalImageHandler.php b/includes/media/TransformationalImageHandler.php
index 60aec45729..2a74e0d708 100644
--- a/includes/media/TransformationalImageHandler.php
+++ b/includes/media/TransformationalImageHandler.php
@@ -521,7 +521,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 				$cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
 				wfDebug( $method . ": Running convert -version\n" );
 				$retval = '';
-				$return = wfShellExec( $cmd, $retval );
+				$return = wfShellExecWithStderr( $cmd, $retval );
 				$x = preg_match(
 					'/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches
 				);
@@ -569,7 +569,7 @@ abstract class TransformationalImageHandler extends ImageHandler {
 	 */
 	public function rotate( $file, $params ) {
 		return new MediaTransformError( 'thumbnail_error', 0, 0,
-			get_class( $this ) . ' rotation not implemented' );
+			static::class . ' rotation not implemented' );
 	}
 
 	/**