http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90582
Revision: 90582
Author: mgrabovsky
Date: 2011-06-22 13:35:24 +0000 (Wed, 22 Jun 2011)
Log Message:
-----------
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
Modified Paths:
--------------
trunk/phase3/includes/specials/SpecialUpload.php
trunk/phase3/includes/upload/UploadBase.php
Modified: trunk/phase3/includes/specials/SpecialUpload.php
===================================================================
--- trunk/phase3/includes/specials/SpecialUpload.php 2011-06-22 13:10:46 UTC
(rev 90581)
+++ trunk/phase3/includes/specials/SpecialUpload.php 2011-06-22 13:35:24 UTC
(rev 90582)
@@ -609,9 +609,9 @@
// 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() );
Modified: trunk/phase3/includes/upload/UploadBase.php
===================================================================
--- trunk/phase3/includes/upload/UploadBase.php 2011-06-22 13:10:46 UTC (rev
90581)
+++ trunk/phase3/includes/upload/UploadBase.php 2011-06-22 13:35:24 UTC (rev
90582)
@@ -532,7 +532,7 @@
if ( $wgCheckFileExtensions ) {
if ( !$this->checkFileExtension(
$this->mFinalExtension, $wgFileExtensions ) ) {
$warnings['filetype-unwanted-type'] = array(
$this->mFinalExtension,
- $wgLang->commaList( $wgFileExtensions )
);
+ $wgLang->commaList( $wgFileExtensions
), count( $wgFileExtensions ) );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
