From: Alexandre Emsenhuber <ialex.wiki@gmail.com>
Date: Fri, 8 Jun 2012 07:05:57 +0000 (+0200)
Subject: Fix PHP notice in 3695486 (Ie35a8b91).
X-Git-Tag: 1.31.0-rc.0~23358^2
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=5fab788b0750af07d20100123e5f7ff4b8cdb121;p=lhc%2Fweb%2Fwiklou.git

Fix PHP notice in 3695486 (Ie35a8b91).

The error was: Notice: Undefined variable: line in includes/specials/SpecialMergeHistory.php on line 289

Change-Id: I23186c2c5682ae8b91978a981f5aceda67cd1b46
---

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 7fbe9106c6..59b4300a10 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -285,10 +285,8 @@ class SpecialMergeHistory extends SpecialPage {
 		}
 		$comment = Linker::revComment( $rev );
 
-		$revisionRow = $this->msg( 'mergehistory-revisionrow' )->rawParams( $checkBox, $last, $pageLink, $userLink, $stxt, $comment)->escaped();
-		$revisionRow .= "<li>" . $line . "</li>";
-
-		return $revisionRow;
+		return Html::rawElement( 'li', array(),
+			$this->msg( 'mergehistory-revisionrow' )->rawParams( $checkBox, $last, $pageLink, $userLink, $stxt, $comment )->escaped() );
 	}
 
 	function merge() {