From d417de70fcf39e0a7a15ba780b597914d16ca0f7 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 12 Mar 2014 18:12:23 +0100
Subject: Update to MediaWiki 1.22.4

---
 extensions/PdfHandler/PdfHandler_body.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'extensions/PdfHandler/PdfHandler_body.php')

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 );
-- 
cgit v1.2.3-54-g00ecf