| Index: trunk/phase3/includes/upload/UploadBase.php |
| — | — | @@ -191,7 +191,6 @@ |
| 192 | 192 | $verification = array( $verification ); |
| 193 | 193 | return array( 'status' => self::VERIFICATION_ERROR, |
| 194 | 194 | 'details' => $verification ); |
| 195 | | - |
| 196 | 195 | } |
| 197 | 196 | |
| 198 | 197 | $error = ''; |
| — | — | @@ -818,7 +817,7 @@ |
| 819 | 818 | # that does not seem to be worth the pain. |
| 820 | 819 | # Ask me (Duesentrieb) about it if it's ever needed. |
| 821 | 820 | $output = array(); |
| 822 | | - $output = wfShellExec($command, $exitCode); |
| | 821 | + $output = wfShellExec("$command 2>&1", $exitCode); |
| 823 | 822 | |
| 824 | 823 | |
| 825 | 824 | # map exit code to AV_xxx constants. |