Remove undefined $env and TODO comment for it too
authorReedy <reedy@wikimedia.org>
Thu, 20 Feb 2014 03:47:25 +0000 (03:47 +0000)
committerReedy <reedy@wikimedia.org>
Thu, 20 Feb 2014 03:47:25 +0000 (03:47 +0000)
Change-Id: Ie69a68c8ff429ac79796890d1843cf2a2b9c32e8

includes/media/Bitmap.php

index a608657..607c4e5 100644 (file)
@@ -797,8 +797,7 @@ class BitmapHandler extends ImageHandler {
                                wfDebug( __METHOD__ . ": running ImageMagick: $cmd\n" );
                                wfProfileIn( 'convert' );
                                $retval = 0;
-                               // @todo FIXME: Undefined variable %env
-                               $err = wfShellExecWithStderr( $cmd, $retval, $env );
+                               $err = wfShellExecWithStderr( $cmd, $retval );
                                wfProfileOut( 'convert' );
                                if ( $retval !== 0 ) {
                                        $this->logErrorForExternalProcess( $retval, $err, $cmd );