X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2FSpecialMergeHistory.php;h=89eb410304701104428fd4720f32834e773d50af;hb=743007a4d8245f45b11033386707ab118a4f460b;hp=b916c1fc7860bfe2ed35ade8733dd90dcad0b6a9;hpb=6e71511047de1f6ed8de40c9b2cb1a860ab8a716;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index b916c1fc78..89eb410304 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -224,11 +224,11 @@ class SpecialMergeHistory extends SpecialPage {
 					'</td>
 					<td class="mw-input">' .
 					Xml::input( 'wpComment', 50, $this->mComment, [ 'id' => 'wpComment' ] ) .
-					'</td>
+					"</td>
 					</tr>
 					<tr>
-						<td>&#160;</td>
-						<td class="mw-submit">' .
+						<td>\u{00A0}</td>
+						<td class=\"mw-submit\">" .
 					Xml::submitButton(
 						$this->msg( 'mergehistory-submit' )->text(),
 						[ 'name' => 'merge', 'id' => 'mw-merge-submit' ]
@@ -277,6 +277,8 @@ class SpecialMergeHistory extends SpecialPage {
 	function formatRevisionRow( $row ) {
 		$rev = new Revision( $row );
 
+		$linkRenderer = $this->getLinkRenderer();
+
 		$stxt = '';
 		$last = $this->msg( 'last' )->escaped();
 
@@ -285,9 +287,9 @@ class SpecialMergeHistory extends SpecialPage {
 
 		$user = $this->getUser();
 
-		$pageLink = Linker::linkKnown(
+		$pageLink = $linkRenderer->makeKnownLink(
 			$rev->getTitle(),
-			htmlspecialchars( $this->getLanguage()->userTimeAndDate( $ts, $user ) ),
+			$this->getLanguage()->userTimeAndDate( $ts, $user ),
 			[],
 			[ 'oldid' => $rev->getId() ]
 		);
@@ -299,9 +301,9 @@ class SpecialMergeHistory extends SpecialPage {
 		if ( !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
 			$last = $this->msg( 'last' )->escaped();
 		} elseif ( isset( $this->prevId[$row->rev_id] ) ) {
-			$last = Linker::linkKnown(
+			$last = $linkRenderer->makeKnownLink(
 				$rev->getTitle(),
-				$this->msg( 'last' )->escaped(),
+				$this->msg( 'last' )->text(),
 				[],
 				[
 					'diff' => $row->rev_id,
@@ -359,7 +361,9 @@ class SpecialMergeHistory extends SpecialPage {
 			return false;
 		}
 
-		$targetLink = Linker::link(
+		$linkRenderer = $this->getLinkRenderer();
+
+		$targetLink = $linkRenderer->makeLink(
 			$targetTitle,
 			null,
 			[],