jenkins-bot has submitted this change and it was merged.
Change subject: Remove another undefined $env and TODO comment for it too
......................................................................
Remove another undefined $env and TODO comment for it too
Follow-Up: Ie69a68c8ff429ac79796890d1843cf2a2b9c32e8
Change-Id: I767cb09215f8b51a9e88c770d3b0f87c37452d00
---
M includes/media/Jpeg.php
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/media/Jpeg.php b/includes/media/Jpeg.php
index ee7eff8..9ed626f 100644
--- a/includes/media/Jpeg.php
+++ b/includes/media/Jpeg.php
@@ -80,8 +80,7 @@
wfDebug( __METHOD__ . ": running jpgtran: $cmd\n" );
wfProfileIn( 'jpegtran' );
$retval = 0;
- // @todo FIXME Undefined variable $env
- $err = wfShellExecWithStderr( $cmd, $retval, $env );
+ $err = wfShellExecWithStderr( $cmd, $retval );
wfProfileOut( 'jpegtran' );
if ( $retval !== 0 ) {
$this->logErrorForExternalProcess( $retval,
$err, $cmd );
--
To view, visit https://gerrit.wikimedia.org/r/114482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I767cb09215f8b51a9e88c770d3b0f87c37452d00
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Umherirrender <umherirrender_de...@web.de>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Brian Wolff <bawolff...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
