X-Git-Url: http://git.cyclocoop.org/%28?a=blobdiff_plain;f=includes%2Fmedia%2FSvgHandler.php;h=a9c7b4fe899c360210953a8ea0936591455c8ff7;hb=1e680456b4b2f5f2a33df4acceafc03d6c8f75b1;hp=a589dbf3fbb0ab37b5c5abff16366dd6556d04c7;hpb=97402532d48de203925a850a4afa2d8f43e3dd9f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/SvgHandler.php b/includes/media/SvgHandler.php
index a589dbf3fb..a9c7b4fe89 100644
--- a/includes/media/SvgHandler.php
+++ b/includes/media/SvgHandler.php
@@ -291,12 +291,16 @@ class SvgHandler extends ImageHandler {
 			if ( is_array( $wgSVGConverters[$wgSVGConverter] ) ) {
 				// This is a PHP callable
 				$func = $wgSVGConverters[$wgSVGConverter][0];
-				$args = array_merge( [ $srcPath, $dstPath, $width, $height, $lang ],
-					array_slice( $wgSVGConverters[$wgSVGConverter], 1 ) );
 				if ( !is_callable( $func ) ) {
 					throw new MWException( "$func is not callable" );
 				}
-				$err = call_user_func_array( $func, $args );
+				$err = $func( $srcPath,
+					$dstPath,
+					$width,
+					$height,
+					$lang,
+					...array_slice( $wgSVGConverters[$wgSVGConverter], 1 )
+				);
 				$retval = (bool)$err;
 			} else {
 				// External command