wikimedia/mediawiki-extensions-PdfHandler
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/PdfHandler synced 2024-11-27 09:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Change 2>&1 in doTransform to use wfShellExecWithStderr instead"

Browse source
This commit is contained in:
jenkins-bot 2014-01-16 04:44:30 +00:00 committed by Gerrit Code Review
parent 239b8efff6 8dae0f163c
commit 7eec21c89c
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
PdfHandler_body.php
View file

@ -173,12 +173,11 @@ class PdfHandler extends ImageHandler {
$cmd .= " | " . wfEscapeShellArg( $wgPdfPostProcessor );
$cmd .= " -depth 8 -resize {$width} - ";
$cmd .= wfEscapeShellArg( $dstPath ) . ")";
$cmd .= " 2>&1";
wfProfileIn( 'PdfHandler' );
wfDebug( __METHOD__ . ": $cmd\n" );
$retval = '';
$err = wfShellExec( $cmd, $retval );
$err = wfShellExecWithStderr( $cmd, $retval );
wfProfileOut( 'PdfHandler' );
$removed = $this->removeBadFile( $dstPath, $retval );