r92454 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r92453‎ | r92454 | r92455 >
Date:18:05, 18 July 2011
Author:mah
Status:ok
Tags:
Comment:
Bug #29874 - Image extension strict whitelist handling is inconsistent
Patch from Dan Collins
Modified paths:
  • /trunk/phase3/CREDITS (modified) (history)
  • /trunk/phase3/includes/upload/UploadBase.php (modified) (history)

Diff [purge]

Index: trunk/phase3/CREDITS
@@ -90,6 +90,7 @@
9191 * Carsten Nielsen
9292 * Conrad Irwin
9393 * Dan Barrett
 94+* Dan Collins
9495 * Dan Nessett
9596 * Daniel Arnold
9697 * Denny Vrandecic
Index: trunk/phase3/includes/upload/UploadBase.php
@@ -672,7 +672,7 @@
673673 return $this->mTitle = null;
674674 } elseif ( $blackListedExtensions ||
675675 ( $wgCheckFileExtensions && $wgStrictFileExtensions &&
676 - !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) ) {
 676+ !$this->checkFileExtensionList( $ext, $wgFileExtensions ) ) ) {
677677 $this->mBlackListedExtensions = $blackListedExtensions;
678678 $this->mTitleError = self::FILETYPE_BADTYPE;
679679 return $this->mTitle = null;

Status & tagging log