Follow-up to r78285: remove blacklisted file types from $wgFileExtensions in Setup...

diff --git a/includes/Setup.php b/includes/Setup.php
index d28b339..fccddbd 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -298,6 +298,9 @@ if ( $wgInvalidateCacheOnLocalSettingsChange ) {
        $wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( "$IP/LocalSettings.php" ) ) );
 }
 
+# Blacklisted file extensions shouldn't appear on the "allowed" list
+$wgFileExtensions = array_diff ( $wgFileExtensions, $wgFileBlacklist );
+
 wfProfileOut( $fname.'-misc1' );
 wfProfileIn( $fname.'-memcached' );
 

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 0e81f91..2db1e27 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -899,9 +899,6 @@ 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 =