From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 3 Sep 2010 16:00:58 +0000 (+0000)
Subject: Followup r72238, remove &
X-Git-Tag: 1.31.0-rc.0~35198
X-Git-Url: http://git.cyclocoop.org/%7B%7B%20url_for%28%27admin_vote_add%27%29%20%7D%7D?a=commitdiff_plain;h=5583dacd0af5ff2d730f7c2c5ef6cb081d7430de;p=lhc%2Fweb%2Fwiklou.git

Followup r72238, remove &
---

diff --git a/includes/DjVuImage.php b/includes/DjVuImage.php
index 330fe4a7d2..c202024ef2 100644
--- a/includes/DjVuImage.php
+++ b/includes/DjVuImage.php
@@ -249,7 +249,7 @@ class DjVuImage {
 			$cmd = wfEscapeShellArg( $wgDjvuTxt ) . ' --detail=page ' . wfEscapeShellArg( $this->mFilename ) ;
 			wfDebug( __METHOD__.": $cmd\n" );
 			$retval = '';
-			$txt = wfShellExec( $cmd, &$retval );
+			$txt = wfShellExec( $cmd, $retval );
 			wfProfileOut( 'djvutxt' );
 			if( $retval == 0) {
 				# Get rid of invalid UTF-8, strip control characters
diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index ce42ef58a3..4909af2f4e 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -363,7 +363,7 @@ class BitmapHandler extends ImageHandler {
 			$cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version';
 			wfDebug( __METHOD__.": Running convert -version\n" );
 			$retval = '';
-			$return = wfShellExec( $cmd, &$retval );
+			$return = wfShellExec( $cmd, $retval );
 			$x = preg_match('/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches);
 			if( $x != 1 ) {
 				wfDebug( __METHOD__.": ImageMagick version check failed\n" );
diff --git a/includes/media/DjVu.php b/includes/media/DjVu.php
index 84d6828ca2..cc3f1db592 100644
--- a/includes/media/DjVu.php
+++ b/includes/media/DjVu.php
@@ -109,7 +109,7 @@ class DjVuHandler extends ImageHandler {
 		wfProfileIn( 'ddjvu' );
 		wfDebug( __METHOD__.": $cmd\n" );
 		$retval = '';
-		$err = wfShellExec( $cmd, &$retval );
+		$err = wfShellExec( $cmd, $retval );
 		wfProfileOut( 'ddjvu' );
 
 		$removed = $this->removeBadFile( $dstPath, $retval );
diff --git a/includes/media/SVG.php b/includes/media/SVG.php
index cfb02d45fc..242b2645b7 100644
--- a/includes/media/SVG.php
+++ b/includes/media/SVG.php
@@ -95,7 +95,7 @@ class SvgHandler extends ImageHandler {
 			) . " 2>&1";
 			wfProfileIn( 'rsvg' );
 			wfDebug( __METHOD__.": $cmd\n" );
-			$err = wfShellExec( $cmd, &$retval );
+			$err = wfShellExec( $cmd, $retval );
 			wfProfileOut( 'rsvg' );
 		}
 		$removed = $this->removeBadFile( $dstPath, $retval );