Bug #29874 - Image extension strict whitelist handling is inconsistent

Patch from Dan Collins

diff --git a/CREDITS b/CREDITS
index a3b13e5..7c29b10 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -90,6 +90,7 @@ following names for their contribution to the product.
 * Carsten Nielsen
 * Conrad Irwin
 * Dan Barrett
+* Dan Collins
 * Dan Nessett
 * Daniel Arnold
 * Denny Vrandecic

diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index fc64818..003573f 100644 (file)
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -672,7 +672,7 @@ abstract class UploadBase {
                        return $this->mTitle = null;
                } elseif ( $blackListedExtensions ||
                                ( $wgCheckFileExtensions && $wgStrictFileExtensions &&
-                                       !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) {
+                                       !$this->checkFileExtensionList( $ext, $wgFileExtensions ) ) ) {
                        $this->mBlackListedExtensions = $blackListedExtensions;
                        $this->mTitleError = self::FILETYPE_BADTYPE;
                        return $this->mTitle = null;