From 03a47120bd815a0acb83e78c88916b2472b50375 Mon Sep 17 00:00:00 2001 From: Daniel Kinzler Date: Mon, 30 Aug 2010 12:51:44 +0000 Subject: [PATCH] as per r71789: don't guess mime type again, that's expensive. Re-use the value from FileProps. --- includes/upload/UploadBase.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 ); -- 2.20.1