| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -466,6 +466,7 @@ |
| 467 | 467 | show up as (struck-out) bluelinks instead of redlinks on Special:WantedFiles |
| 468 | 468 | * rebuildFileCache.php no longer creates inappropriate cache files for redirects |
| 469 | 469 | * (bug 23119) WikiError class and subclasses are now marked as deprecated |
| | 470 | +* (bug 18372) $wgFileExtensions will now override $wgFileBlacklist |
| 470 | 471 | |
| 471 | 472 | === API changes in 1.17 === |
| 472 | 473 | * (bug 22738) Allow filtering by action type on query=logevent. |
| Index: trunk/phase3/includes/upload/UploadBase.php |
| — | — | @@ -568,9 +568,10 @@ |
| 569 | 569 | if ( $this->mFinalExtension == '' ) { |
| 570 | 570 | $this->mTitleError = self::FILETYPE_MISSING; |
| 571 | 571 | return $this->mTitle = null; |
| 572 | | - } elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) || |
| 573 | | - ( $wgCheckFileExtensions && $wgStrictFileExtensions && |
| 574 | | - !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) { |
| | 572 | + } elseif ( ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) |
| | 573 | + && !$this->checkFileExtensionList( $ext, $wgFileExtensions ) ) || |
| | 574 | + ( $wgCheckFileExtensions && $wgStrictFileExtensions && |
| | 575 | + !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) { |
| 575 | 576 | $this->mTitleError = self::FILETYPE_BADTYPE; |
| 576 | 577 | return $this->mTitle = null; |
| 577 | 578 | } |