From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Sat, 11 Dec 2010 03:53:22 +0000 (+0000)
Subject: * Add FIXME about the bug I found during testing
X-Git-Tag: 1.31.0-rc.0~33374
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=e002df9ecac5f18f9d5a8d57bec572e3b901d47c;p=lhc%2Fweb%2Fwiklou.git

* Add FIXME about the bug I found during testing
* Make the only instance of the ParserOptions::getMaxIncludeSize() that doesn't match its method signature match.
---

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index aea7f20baa..2c70cae1fd 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2971,6 +2971,7 @@ class Parser {
 		$originalTitle = $part1;
 
 		# $args is a list of argument nodes, starting from index 0, not including $part1
+		# *** FIXME if piece['parts'] is null then the call to getLength() below won't work b/c this $args isn't an object
 		$args = ( null == $piece['parts'] ) ? array() : $piece['parts'];
 		wfProfileOut( __METHOD__.'-setup' );
 
@@ -3566,7 +3567,7 @@ class Parser {
 	 * @return Boolean: false if this inclusion would take it over the maximum, true otherwise
 	 */
 	function incrementIncludeSize( $type, $size ) {
-		if ( $this->mIncludeSizes[$type] + $size > $this->mOptions->getMaxIncludeSize( $type ) ) {
+		if ( $this->mIncludeSizes[$type] + $size > $this->mOptions->getMaxIncludeSize() ) {
 			return false;
 		} else {
 			$this->mIncludeSizes[$type] += $size;