Follow-up to r77956: instead of making $wgFileExtensions override $wgFileBlacklist...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index de3c6d8..1c1cfff 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -34,6 +34,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   cannot read the page in question.
 * (bug 19006) {{REVISIONUSER}} no longer acts like {{CURRENTUSER}} in some cases
 * (bug 16019) $wgArticlePath = "/$1" no longer breaks API edit/watch actions
+* (bug 18372) File types blacklisted by $wgFileBlacklist will no longer be shown as "Permitted file types" on the upload form
 
 === API changes in 1.18 ===
 

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 37db906..48e700c 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -899,6 +899,9 @@ class UploadForm extends HTMLForm {
                $wgFileExtensions, $wgFileBlacklist;
 
                if( $wgCheckFileExtensions ) {
+                       //don't show blacklisted types as permitted
+                       $wgFileExtensions = array_diff ( $wgFileExtensions, $wgFileBlacklist );
+                       
                        if( $wgStrictFileExtensions ) {
                                # Everything not permitted is banned
                                $extensionsList =

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 424ce11..1e3414f 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -568,10 +568,9 @@ abstract class UploadBase {
                if ( $this->mFinalExtension == '' ) {
                        $this->mTitleError = self::FILETYPE_MISSING;
                        return $this->mTitle = null;
-               } elseif ( ( $this->checkFileExtensionList( $ext, $wgFileBlacklist )
-                               && !$this->checkFileExtensionList( $ext, $wgFileExtensions ) ) ||
-                                       ( $wgCheckFileExtensions && $wgStrictFileExtensions &&
-                                               !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) {
+               } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) ||
+                               ( $wgCheckFileExtensions && $wgStrictFileExtensions &&
+                                       !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) {
                        $this->mTitleError = self::FILETYPE_BADTYPE;
                        return $this->mTitle = null;
                }