From 5b11098eafd11faf0c8a99b8db3f262e7ce2e42b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Mat=C4=9Bj=20Grabovsk=C3=BD?= Date: Wed, 22 Jun 2011 13:35:24 +0000 Subject: [PATCH] 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 --- includes/specials/SpecialUpload.php | 4 ++-- includes/upload/UploadBase.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 ) ); } } -- 2.20.1