From af4da56f1ad4d3ef7b06557bae365da2ea27a897 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 14 Nov 2013 23:19:13 +0100
Subject: Update to MediaWiki 1.21.3

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

(limited to 'includes/upload')

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 5a823622..e72669d4 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -406,10 +406,10 @@ abstract class UploadBase {
 			return $status;
 		}
 
-		if ( $wgVerifyMimeType ) {
-			$this->mFileProps = FSFile::getPropsFromPath( $this->mTempPath, $this->mFinalExtension );
-			$mime = $this->mFileProps['file-mime'];
+		$this->mFileProps = FSFile::getPropsFromPath( $this->mTempPath, $this->mFinalExtension );
+		$mime = $this->mFileProps['file-mime'];
 
+		if ( $wgVerifyMimeType ) {
 			# XXX: Missing extension will be caught by validateName() via getTitle()
 			if ( $this->mFinalExtension != '' && !$this->verifyExtension( $mime, $this->mFinalExtension ) ) {
 				wfProfileOut( __METHOD__ );
-- 
cgit v1.2.2