X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fmedia%2FBitmapHandler.php;h=f003554727608f204b7d355a1acd2b583650a325;hb=75f937543b8d3eaec8d3fe4f726c088ef028abab;hp=cda037c16d317ba40fe79ff84904887a6e6a2bc1;hpb=e03b96c9a474831fb1b1d1fc1e6cd2de496dc251;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/BitmapHandler.php b/includes/media/BitmapHandler.php
index cda037c16d..f003554727 100644
--- a/includes/media/BitmapHandler.php
+++ b/includes/media/BitmapHandler.php
@@ -91,7 +91,7 @@ class BitmapHandler extends TransformationalImageHandler {
 	 * @param array &$params
 	 * @return bool
 	 */
-	function normaliseParams( $image, &$params ) {
+	public function normaliseParams( $image, &$params ) {
 		global $wgMaxInterlacingAreas;
 		if ( !parent::normaliseParams( $image, $params ) ) {
 			return false;
@@ -228,7 +228,7 @@ class BitmapHandler extends TransformationalImageHandler {
 		$rotation = isset( $params['disableRotation'] ) ? 0 : $this->getRotation( $image );
 		list( $width, $height ) = $this->extractPreRotationDimensions( $params, $rotation );
 
-		$cmd = call_user_func_array( 'wfEscapeShellArg', array_merge(
+		$cmd = wfEscapeShellArg( ...array_merge(
 			[ $wgImageMagickConvertCommand ],
 			$quality,
 			// Specify white background color, will be used for transparent images
@@ -338,10 +338,8 @@ class BitmapHandler extends TransformationalImageHandler {
 			}
 			$im->setImageDepth( 8 );
 
-			if ( $rotation ) {
-				if ( !$im->rotateImage( new ImagickPixel( 'white' ), 360 - $rotation ) ) {
-					return $this->getMediaTransformError( $params, "Error rotating $rotation degrees" );
-				}
+			if ( $rotation && !$im->rotateImage( new ImagickPixel( 'white' ), 360 - $rotation ) ) {
+				return $this->getMediaTransformError( $params, "Error rotating $rotation degrees" );
 			}
 
 			if ( $this->isAnimatedImage( $image ) ) {
@@ -449,7 +447,7 @@ class BitmapHandler extends TransformationalImageHandler {
 			return $this->getMediaTransformError( $params, $errMsg );
 		}
 
-		$src_image = call_user_func( $loader, $params['srcPath'] );
+		$src_image = $loader( $params['srcPath'] );
 
 		$rotation = function_exists( 'imagerotate' ) && !isset( $params['disableRotation'] ) ?
 			$this->getRotation( $image ) :
@@ -489,7 +487,7 @@ class BitmapHandler extends TransformationalImageHandler {
 		if ( $useQuality && isset( $params['quality'] ) ) {
 			$funcParams[] = $params['quality'];
 		}
-		call_user_func_array( $saveType, $funcParams );
+		$saveType( ...$funcParams );
 
 		imagedestroy( $dst_image );
 		imagedestroy( $src_image );