From: Daniel Kinzler <daniel@users.mediawiki.org>
Date: Mon, 30 Aug 2010 12:51:44 +0000 (+0000)
Subject: as per r71789: don't guess mime type again, that's expensive. Re-use the value from... 
X-Git-Tag: 1.31.0-rc.0~35274
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_modifier.php?a=commitdiff_plain;h=03a47120bd815a0acb83e78c88916b2472b50375;p=lhc%2Fweb%2Fwiklou.git

as per r71789: don't guess mime type again, that's expensive. Re-use the value from FileProps.
---

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