Follow up to r57868: Fix virus scanner on Windows (r57801 et al)

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 65f07df..105a421 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -791,12 +791,7 @@ abstract class UploadBase {
                #NOTE: there's a 50 line workaround to make stderr redirection work on windows, too.
                #      that does not seem to be worth the pain.
                #      Ask me (Duesentrieb) about it if it's ever needed.
-               $output = array();
-               if ( wfIsWindows() ) {
-                       exec( "$command", $output, $exitCode );
-               } else {
-                       exec( "$command 2>&1", $output, $exitCode );
-               }
+               $output = wfShellExec( "$command 2>&1", $exitCode );
 
                # map exit code to AV_xxx constants.
                $mappedCode = $exitCode;
@@ -826,7 +821,6 @@ abstract class UploadBase {
                        wfDebug( __METHOD__ . ": file passed virus scan.\n" );
                        return false;
                } else {
-                       $output = join( "\n", $output );
                        $output = trim( $output );
 
                        if ( !$output ) {