reverting r71944 as per TheDJ's comment. Will investigate a better way to avoid redun...

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 8ad94f5..aa47e10 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -344,8 +344,9 @@ abstract class UploadBase {
                $this->mFileProps = File::getPropsFromPath( $this->mTempPath, $this->mFinalExtension );
                $this->checkMacBinary();
 
-               $mime = $this->mFileProps[ 'mime' ];
+               # magically determine mime type
                $magic = MimeMagic::singleton();
+               $mime = $magic->guessMimeType( $this->mTempPath, false );
 
                # check mime type, if desired
                $status = $this->verifyMimeType( $magic, $mime );