From: Benjamin Lees <emufarmers@users.mediawiki.org>
Date: Tue, 7 Dec 2010 03:21:00 +0000 (+0000)
Subject: (bug 18372) $wgFileExtensions will now override $wgFileBlacklist
X-Git-Tag: 1.31.0-rc.0~33489
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=cf2611371ddf1509dcc3fe9da961f51c865084d0;p=lhc%2Fweb%2Fwiklou.git

(bug 18372) $wgFileExtensions will now override $wgFileBlacklist
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2a8413543b..804ad8668a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -466,6 +466,7 @@ LocalSettings.php. The specific bugs are listed below in the general notes.
   show up as (struck-out) bluelinks instead of redlinks on Special:WantedFiles
 * rebuildFileCache.php no longer creates inappropriate cache files for redirects
 * (bug 23119) WikiError class and subclasses are now marked as deprecated
+* (bug 18372) $wgFileExtensions will now override $wgFileBlacklist 
 
 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 1e3414f350..424ce11fe5 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -568,9 +568,10 @@ abstract class UploadBase {
 		if ( $this->mFinalExtension == '' ) {
 			$this->mTitleError = self::FILETYPE_MISSING;
 			return $this->mTitle = null;
-		} elseif ( $this->checkFileExtensionList( $ext, $wgFileBlacklist ) ||
-				( $wgCheckFileExtensions && $wgStrictFileExtensions &&
-					!$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) {
+		} elseif ( ( $this->checkFileExtensionList( $ext, $wgFileBlacklist )
+				&& !$this->checkFileExtensionList( $ext, $wgFileExtensions ) ) ||
+					( $wgCheckFileExtensions && $wgStrictFileExtensions &&
+						!$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) {
 			$this->mTitleError = self::FILETYPE_BADTYPE;
 			return $this->mTitle = null;
 		}