diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2013-11-14 23:19:13 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2013-11-14 23:19:13 +0100 |
commit | af4da56f1ad4d3ef7b06557bae365da2ea27a897 (patch) | |
tree | c018c4033c36be77f9ec699cfd485be82c7542d7 /includes/upload | |
parent | 91e194556c52d2f354344f930419eef2dd6267f0 (diff) |
Update to MediaWiki 1.21.3
Diffstat (limited to 'includes/upload')
-rw-r--r-- | includes/upload/UploadBase.php | 6 |
1 files changed, 3 insertions, 3 deletions
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__ ); |