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 7fbe910..59b4300 100644 (file)
--- 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() {