From: Tim Starling <tstarling@wikimedia.org>
Date: Mon, 27 Aug 2012 00:40:27 +0000 (+1000)
Subject: Fix exception on parse due wfMsgExt() -> wfMessage()
X-Git-Tag: 1.31.0-rc.0~22593
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=c39ba9706ae44ad7f302957e51cd2cef3d9a7242;p=lhc%2Fweb%2Fwiklou.git

Fix exception on parse due wfMsgExt() -> wfMessage()

Replacing wfMsgExt() with wfMessage() in 4e1ccf0 causes an exception on
parse when the defaults are used for $current and $max. I don't know if
there are other similar fatal errors caused by that set of commits.

Change-Id: I84cfdede844bb2dd3c106721b972ed1cd8bfe480
---

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 489451a2ef..5f211b183b 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -3086,7 +3086,7 @@ class Parser {
 	 * @param $max int|null Maximum allowed, when an explicit limit has been
 	 *	 exceeded, provide the values (optional)
 	 */
-	function limitationWarn( $limitationType, $current = null, $max = null) {
+	function limitationWarn( $limitationType, $current = '', $max = '' ) {
 		# does no harm if $current and $max are present but are unnecessary for the message
 		$warning = wfMessage( "$limitationType-warning" )->numParams( $current, $max )
 			->inContentLanguage()->escaped();