as per r71789: don't guess mime type again, that's expensive. Re-use the value from...
authorDaniel Kinzler <daniel@users.mediawiki.org>
Mon, 30 Aug 2010 12:51:44 +0000 (12:51 +0000)
committerDaniel Kinzler <daniel@users.mediawiki.org>
Mon, 30 Aug 2010 12:51:44 +0000 (12:51 +0000)
includes/upload/UploadBase.php

index aa47e10..8ad94f5 100644 (file)
@@ -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 );