summaryrefslogtreecommitdiff
path: root/extensions/PdfHandler/PdfHandler_body.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2014-03-12 18:12:23 +0100
committerPierre Schmitz <pierre@archlinux.de>2014-03-12 18:12:23 +0100
commitd417de70fcf39e0a7a15ba780b597914d16ca0f7 (patch)
tree06ef8c333473660350b995abc03e18f3f85359eb /extensions/PdfHandler/PdfHandler_body.php
parenta4edbfa031eb4cd72678051f1510afde4f77951e (diff)
Update to MediaWiki 1.22.4
Diffstat (limited to 'extensions/PdfHandler/PdfHandler_body.php')
-rw-r--r--extensions/PdfHandler/PdfHandler_body.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/PdfHandler/PdfHandler_body.php b/extensions/PdfHandler/PdfHandler_body.php
index 495f3bb8..d9ed4884 100644
--- a/extensions/PdfHandler/PdfHandler_body.php
+++ b/extensions/PdfHandler/PdfHandler_body.php
@@ -188,12 +188,12 @@ class PdfHandler extends ImageHandler {
"-",
$dstPath
);
- $cmd .= ")";
+ $cmd .= ") 2>&1";
wfProfileIn( 'PdfHandler' );
wfDebug( __METHOD__ . ": $cmd\n" );
$retval = '';
- $err = wfShellExecWithStderr( $cmd, $retval );
+ $err = wfShellExec( $cmd, $retval );
wfProfileOut( 'PdfHandler' );
$removed = $this->removeBadFile( $dstPath, $retval );