From: Matěj Grabovský <mgrabovsky@users.mediawiki.org>
Date: Wed, 22 Jun 2011 13:35:24 +0000 (+0000)
Subject: Follow-up r90369: Add third parameter to filetype-unwanted-type (for PLURAL)
X-Git-Tag: 1.31.0-rc.0~29366
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/operations/?a=commitdiff_plain;h=5b11098eafd11faf0c8a99b8db3f262e7ce2e42b;p=lhc%2Fweb%2Fwiklou.git

Follow-up r90369: Add third parameter to filetype-unwanted-type (for PLURAL)

Also use params() insted of numParams() on an ocassion, as it's not really needed there
---

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 2c4fb4b34c..5f8f88f04f 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -609,9 +609,9 @@ class SpecialUpload extends SpecialPage {
 				// in a bit unlogical parameter sequence, but does not break
 				// old translations
 				if ( isset( $details['blacklistedExt'] ) ) {
-					$msg->numParams( count( $details['blacklistedExt'] ) );
+					$msg->params( count( $details['blacklistedExt'] ) );
 				} else {
-					$msg->numParams( 1 );
+					$msg->params( 1 );
 				}
 
 				$this->showUploadError( $msg->parse() );
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 3350ab6743..67b672bf6d 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -532,7 +532,7 @@ abstract class UploadBase {
 		if ( $wgCheckFileExtensions ) {
 			if ( !$this->checkFileExtension( $this->mFinalExtension, $wgFileExtensions ) ) {
 				$warnings['filetype-unwanted-type'] = array( $this->mFinalExtension,
-					$wgLang->commaList( $wgFileExtensions ) );
+					$wgLang->commaList( $wgFileExtensions ), count( $wgFileExtensions ) );
 			}
 		}