From: Kunal Mehta <legoktm@gmail.com>
Date: Mon, 17 Dec 2012 06:24:11 +0000 (-0600)
Subject: (bug 42184) Send second variable for large-variable message
X-Git-Tag: 1.31.0-rc.0~21278
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=69419cd616cba9588a1d845fe3f3852d40400fdc;p=lhc%2Fweb%2Fwiklou.git

(bug 42184) Send second variable for large-variable message

Change-Id: Iad4bb0d0ab25248ec6296af4f39401eeb59c306f
---

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index f2cfbb7315..7ff0683c2c 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -114,6 +114,7 @@ production.
   will require updates to your site's CSS or JS.
 * (bug 41342) jquery.suggestions should cancel any active (async) fetches
   before it triggers another fetch.
+* (bug 42184) $wgUploadSizeWarning missing second variable
 
 === API changes in 1.21 ===
 * prop=revisions can now report the contentmodel and contentformat.
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index fdd5f653b7..dc32a299ce 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -581,7 +581,7 @@ abstract class UploadBase {
 
 		global $wgUploadSizeWarning;
 		if ( $wgUploadSizeWarning && ( $this->mFileSize > $wgUploadSizeWarning ) ) {
-			$warnings['large-file'] = $wgUploadSizeWarning;
+			$warnings['large-file'] = array( $wgUploadSizeWarning, $this->mFileSize );
 		}
 
 		if ( $this->mFileSize == 0 ) {