From 789baad05764c3a191b816a90a44928373d75de9 Mon Sep 17 00:00:00 2001
From: Daniel Kinzler <daniel@users.mediawiki.org>
Date: Tue, 31 Aug 2010 09:38:11 +0000
Subject: [PATCH] reverting r71944 as per TheDJ's comment. Will investigate a
 better way to avoid redundant mime guesses

---
 includes/upload/UploadBase.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 8ad94f5e7a..aa47e1097b 100644
--- 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 );
-- 
2.20.1