| Index: trunk/phase3/includes/upload/UploadBase.php |
| — | — | @@ -791,12 +791,7 @@ |
| 792 | 792 | #NOTE: there's a 50 line workaround to make stderr redirection work on windows, too. |
| 793 | 793 | # that does not seem to be worth the pain. |
| 794 | 794 | # Ask me (Duesentrieb) about it if it's ever needed. |
| 795 | | - $output = array(); |
| 796 | | - if ( wfIsWindows() ) { |
| 797 | | - exec( "$command", $output, $exitCode ); |
| 798 | | - } else { |
| 799 | | - exec( "$command 2>&1", $output, $exitCode ); |
| 800 | | - } |
| | 795 | + $output = wfShellExec( "$command 2>&1", $exitCode ); |
| 801 | 796 | |
| 802 | 797 | # map exit code to AV_xxx constants. |
| 803 | 798 | $mappedCode = $exitCode; |
| — | — | @@ -826,7 +821,6 @@ |
| 827 | 822 | wfDebug( __METHOD__ . ": file passed virus scan.\n" ); |
| 828 | 823 | return false; |
| 829 | 824 | } else { |
| 830 | | - $output = join( "\n", $output ); |
| 831 | 825 | $output = trim( $output ); |
| 832 | 826 | |
| 833 | 827 | if ( !$output ) { |