Follow-up r90369: Add third parameter to filetype-unwanted-type (for PLURAL)
authorMatěj Grabovský <mgrabovsky@users.mediawiki.org>
Wed, 22 Jun 2011 13:35:24 +0000 (13:35 +0000)
committerMatěj Grabovský <mgrabovsky@users.mediawiki.org>
Wed, 22 Jun 2011 13:35:24 +0000 (13:35 +0000)
Also use params() insted of numParams() on an ocassion, as it's not really needed there

includes/specials/SpecialUpload.php
includes/upload/UploadBase.php

index 2c4fb4b..5f8f88f 100644 (file)
@@ -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() );
index 3350ab6..67b672b 100644 (file)
@@ -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 ) );
                        }
                }