From: Reedy <reedy@wikimedia.org>
Date: Thu, 20 Feb 2014 03:47:25 +0000 (+0000)
Subject: Remove undefined $env and TODO comment for it too
X-Git-Tag: 1.31.0-rc.0~16867^2
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=e8ff01276cbe4e5c960df3966bd8c8d25eace25b;p=lhc%2Fweb%2Fwiklou.git

Remove undefined $env and TODO comment for it too

Change-Id: Ie69a68c8ff429ac79796890d1843cf2a2b9c32e8
---

diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index a608657d6a..607c4e51fe 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -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 );