| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -298,6 +298,9 @@ |
| 299 | 299 | $wgCacheEpoch = max( $wgCacheEpoch, gmdate( 'YmdHis', @filemtime( "$IP/LocalSettings.php" ) ) ); |
| 300 | 300 | } |
| 301 | 301 | |
| | 302 | +# Blacklisted file extensions shouldn't appear on the "allowed" list |
| | 303 | +$wgFileExtensions = array_diff ( $wgFileExtensions, $wgFileBlacklist ); |
| | 304 | + |
| 302 | 305 | wfProfileOut( $fname.'-misc1' ); |
| 303 | 306 | wfProfileIn( $fname.'-memcached' ); |
| 304 | 307 | |
| Index: trunk/phase3/includes/specials/SpecialUpload.php |
| — | — | @@ -899,9 +899,6 @@ |
| 900 | 900 | $wgFileExtensions, $wgFileBlacklist; |
| 901 | 901 | |
| 902 | 902 | if( $wgCheckFileExtensions ) { |
| 903 | | - //don't show blacklisted types as permitted |
| 904 | | - $wgFileExtensions = array_diff ( $wgFileExtensions, $wgFileBlacklist ); |
| 905 | | - |
| 906 | 903 | if( $wgStrictFileExtensions ) { |
| 907 | 904 | # Everything not permitted is banned |
| 908 | 905 | $extensionsList = |