http://www.mediawiki.org/wiki/Special:Code/MediaWiki/62809
Revision: 62809
Author: mah
Date: 2010-02-22 03:07:28 +0000 (Mon, 22 Feb 2010)
Log Message:
-----------
follow up r53282
Recover the use of verifyExtension that was lost in r53282
Modified Paths:
--------------
trunk/phase3/includes/upload/UploadBase.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/maintenance/language/messages.inc
Modified: trunk/phase3/includes/upload/UploadBase.php
===================================================================
--- trunk/phase3/includes/upload/UploadBase.php 2010-02-22 02:48:50 UTC (rev
62808)
+++ trunk/phase3/includes/upload/UploadBase.php 2010-02-22 03:07:28 UTC (rev
62809)
@@ -239,6 +239,11 @@
# check mime type, if desired
global $wgVerifyMimeType;
if ( $wgVerifyMimeType ) {
+ wfDebug ( "\n\nmime: <$mime> extension:
<{$this->mFinalExtension}>\n\n");
+ if ( !$this->verifyExtension( $mime,
$this->mFinalExtension ) ) {
+ return array( 'filetype-mime-mismatch' );
+ }
+
global $wgMimeTypeBlacklist;
if ( $this->checkFileExtension( $mime,
$wgMimeTypeBlacklist ) ) {
return array( 'filetype-badmime', $mime );
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2010-02-22 02:48:50 UTC
(rev 62808)
+++ trunk/phase3/languages/messages/MessagesEn.php 2010-02-22 03:07:28 UTC
(rev 62809)
@@ -2040,6 +2040,7 @@
'illegalfilename' => 'The filename "$1" contains characters that
are not allowed in page titles.
Please rename the file and try uploading it again.',
'badfilename' => 'File name has been changed to "$1".',
+'filetype-mime-mismatch' => 'File extension does not match MIME type.',
'filetype-badmime' => 'Files of the MIME type "$1" are not allowed
to be uploaded.',
'filetype-bad-ie-mime' => 'Cannot upload this file because Internet
Explorer would detect it as "$1", which is a disallowed and potentially
dangerous file type.',
'filetype-unwanted-type' => "'''\".\$1\"''' is an unwanted file type.
Modified: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc 2010-02-22 02:48:50 UTC
(rev 62808)
+++ trunk/phase3/maintenance/language/messages.inc 2010-02-22 03:07:28 UTC
(rev 62809)
@@ -1203,6 +1203,7 @@
'minlength1',
'illegalfilename',
'badfilename',
+ 'filetype-mime-mismatch',
'filetype-badmime',
'filetype-bad-ie-mime',
'filetype-unwanted-type',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
