From: Matěj Grabovský <mgrabovsky@users.mediawiki.org>
Date: Sat, 18 Jun 2011 21:27:24 +0000 (+0000)
Subject: (bug 29325) Setting $wgStrictFileExtensions to false gives incorrect warning
X-Git-Tag: 1.31.0-rc.0~29428
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=3533cc19216b1583ae34c8d5c2f505601daec71b;p=lhc%2Fweb%2Fwiklou.git

(bug 29325) Setting $wgStrictFileExtensions to false gives incorrect warning

Also use Language::commaList
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 40b472b73b..ad1a4a2a18 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -99,6 +99,7 @@ production.
 * The class JpegOrTiffHandler was renamed ExifBitmapHandler.
 * (bug 29443) Special:Undelete should use JavaScript to invert all checkboxes
   without reloading the page
+* (bug 29325) Setting $wgStrictFileExtensions to false gives incorrect warning
 
 === API changes in 1.19 ===
 * BREAKING CHANGE: action=watch now requires POST and token.
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index bb5c91f61e..2c4fb4b34c 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -567,7 +567,7 @@ class SpecialUpload extends SpecialPage {
 	 * @param $details Array: result of UploadBase::verifyUpload
 	 */
 	protected function processVerificationError( $details ) {
-		global $wgFileExtensions;
+		global $wgFileExtensions, $wgLang;
 
 		switch( $details['status'] ) {
 
@@ -597,13 +597,12 @@ class SpecialUpload extends SpecialPage {
 				break;
 			case UploadBase::FILETYPE_BADTYPE:
 				$msg = wfMessage( 'filetype-banned-type' );
-				$sep = wfMsg( 'comma-separator' );
 				if ( isset( $details['blacklistedExt'] ) ) {
-					$msg->params( implode( $sep, $details['blacklistedExt'] ) );
+					$msg->params( $wgLang->commaList( $details['blacklistedExt'] ) );
 				} else {
 					$msg->params( $details['finalExt'] );
 				}
-				$msg->params( implode( $sep, $wgFileExtensions ),
+				$msg->params( $wgLang->commaList( $wgFileExtensions ),
 					count( $wgFileExtensions ) );
 
 				// Add PLURAL support for the first parameter. This results
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 58c0472655..3350ab6743 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -509,6 +509,8 @@ abstract class UploadBase {
 	 * @return Array of warnings
 	 */
 	public function checkWarnings() {
+		global $wgLang;
+
 		$warnings = array();
 
 		$localFile = $this->getLocalFile();
@@ -529,7 +531,8 @@ abstract class UploadBase {
 		global $wgCheckFileExtensions, $wgFileExtensions;
 		if ( $wgCheckFileExtensions ) {
 			if ( !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) {
-				$warnings['filetype-unwanted-type'] = $this->mFinalExtension;
+				$warnings['filetype-unwanted-type'] = array( $this->mFinalExtension,
+					$wgLang->commaList( $wgFileExtensions ) );
 			}
 		}