From: Michael Dale <dale@users.mediawiki.org>
Date: Fri, 16 Oct 2009 04:38:40 +0000 (+0000)
Subject: fix per r57729#c4267
X-Git-Tag: 1.31.0-rc.0~39262
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/bilan.php?a=commitdiff_plain;h=103576b6b1dabb16b50092f2eeb551deeb5412a3;p=lhc%2Fweb%2Fwiklou.git

fix per r57729#c4267
---

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 1164f66d09..3f8b1d2c45 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -191,7 +191,6 @@ abstract class UploadBase {
 				$verification = array( $verification );
 			return array( 'status' => self::VERIFICATION_ERROR,
 					'details' => $verification );
-
 		}
 
 		$error = '';
@@ -818,7 +817,7 @@ abstract class UploadBase {
 		#      that does not seem to be worth the pain.
 		#      Ask me (Duesentrieb) about it if it's ever needed.
 		$output = array();
-		$output = wfShellExec($command, $exitCode);
+		$output = wfShellExec("$command 2>&1", $exitCode);
 
 
 		# map exit code to AV_xxx constants.