Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/69257
Change subject: Follow-up 42333412 - Fix behaviour $wgVerifyMimeType = false;
......................................................................
Follow-up 42333412 - Fix behaviour $wgVerifyMimeType = false;
Should probably be backported to stable.
Bug: 49717
Change-Id: If1d6e8fed575bf2816a10db066ec4e023460ee1e
---
M includes/upload/UploadBase.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/57/69257/1
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 2ed20c5..710a501 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -410,10 +410,10 @@
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__ );
--
To view, visit https://gerrit.wikimedia.org/r/69257
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If1d6e8fed575bf2816a10db066ec4e023460ee1e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
