http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72290
Revision: 72290
Author: reedy
Date: 2010-09-03 16:00:58 +0000 (Fri, 03 Sep 2010)
Log Message:
-----------
Followup r72238, remove &
Modified Paths:
--------------
trunk/phase3/includes/DjVuImage.php
trunk/phase3/includes/media/Bitmap.php
trunk/phase3/includes/media/DjVu.php
trunk/phase3/includes/media/SVG.php
Modified: trunk/phase3/includes/DjVuImage.php
===================================================================
--- trunk/phase3/includes/DjVuImage.php 2010-09-03 15:53:08 UTC (rev 72289)
+++ trunk/phase3/includes/DjVuImage.php 2010-09-03 16:00:58 UTC (rev 72290)
@@ -249,7 +249,7 @@
$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
Modified: trunk/phase3/includes/media/Bitmap.php
===================================================================
--- trunk/phase3/includes/media/Bitmap.php 2010-09-03 15:53:08 UTC (rev
72289)
+++ trunk/phase3/includes/media/Bitmap.php 2010-09-03 16:00:58 UTC (rev
72290)
@@ -363,7 +363,7 @@
$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" );
Modified: trunk/phase3/includes/media/DjVu.php
===================================================================
--- trunk/phase3/includes/media/DjVu.php 2010-09-03 15:53:08 UTC (rev
72289)
+++ trunk/phase3/includes/media/DjVu.php 2010-09-03 16:00:58 UTC (rev
72290)
@@ -109,7 +109,7 @@
wfProfileIn( 'ddjvu' );
wfDebug( __METHOD__.": $cmd\n" );
$retval = '';
- $err = wfShellExec( $cmd, &$retval );
+ $err = wfShellExec( $cmd, $retval );
wfProfileOut( 'ddjvu' );
$removed = $this->removeBadFile( $dstPath, $retval );
Modified: trunk/phase3/includes/media/SVG.php
===================================================================
--- trunk/phase3/includes/media/SVG.php 2010-09-03 15:53:08 UTC (rev 72289)
+++ trunk/phase3/includes/media/SVG.php 2010-09-03 16:00:58 UTC (rev 72290)
@@ -95,7 +95,7 @@
) . " 2>&1";
wfProfileIn( 'rsvg' );
wfDebug( __METHOD__.": $cmd\n" );
- $err = wfShellExec( $cmd, &$retval );
+ $err = wfShellExec( $cmd, $retval );
wfProfileOut( 'rsvg' );
}
$removed = $this->removeBadFile( $dstPath, $retval );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
