| Index: trunk/phase3/includes/media/Bitmap.php |
| — | — | @@ -363,7 +363,7 @@ |
| 364 | 364 | $cmd = wfEscapeShellArg( $wgImageMagickConvertCommand ) . ' -version'; |
| 365 | 365 | wfDebug( __METHOD__.": Running convert -version\n" ); |
| 366 | 366 | $retval = ''; |
| 367 | | - $return = wfShellExec( $cmd, &$retval ); |
| | 367 | + $return = wfShellExec( $cmd, $retval ); |
| 368 | 368 | $x = preg_match('/Version: ImageMagick ([0-9]*\.[0-9]*\.[0-9]*)/', $return, $matches); |
| 369 | 369 | if( $x != 1 ) { |
| 370 | 370 | wfDebug( __METHOD__.": ImageMagick version check failed\n" ); |
| Index: trunk/phase3/includes/media/SVG.php |
| — | — | @@ -95,7 +95,7 @@ |
| 96 | 96 | ) . " 2>&1"; |
| 97 | 97 | wfProfileIn( 'rsvg' ); |
| 98 | 98 | wfDebug( __METHOD__.": $cmd\n" ); |
| 99 | | - $err = wfShellExec( $cmd, &$retval ); |
| | 99 | + $err = wfShellExec( $cmd, $retval ); |
| 100 | 100 | wfProfileOut( 'rsvg' ); |
| 101 | 101 | } |
| 102 | 102 | $removed = $this->removeBadFile( $dstPath, $retval ); |
| Index: trunk/phase3/includes/media/DjVu.php |
| — | — | @@ -109,7 +109,7 @@ |
| 110 | 110 | wfProfileIn( 'ddjvu' ); |
| 111 | 111 | wfDebug( __METHOD__.": $cmd\n" ); |
| 112 | 112 | $retval = ''; |
| 113 | | - $err = wfShellExec( $cmd, &$retval ); |
| | 113 | + $err = wfShellExec( $cmd, $retval ); |
| 114 | 114 | wfProfileOut( 'ddjvu' ); |
| 115 | 115 | |
| 116 | 116 | $removed = $this->removeBadFile( $dstPath, $retval ); |
| Index: trunk/phase3/includes/DjVuImage.php |
| — | — | @@ -249,7 +249,7 @@ |
| 250 | 250 | $cmd = wfEscapeShellArg( $wgDjvuTxt ) . ' --detail=page ' . wfEscapeShellArg( $this->mFilename ) ; |
| 251 | 251 | wfDebug( __METHOD__.": $cmd\n" ); |
| 252 | 252 | $retval = ''; |
| 253 | | - $txt = wfShellExec( $cmd, &$retval ); |
| | 253 | + $txt = wfShellExec( $cmd, $retval ); |
| 254 | 254 | wfProfileOut( 'djvutxt' ); |
| 255 | 255 | if( $retval == 0) { |
| 256 | 256 | # Get rid of invalid UTF-8, strip control characters |