From: divadsn <divad.nnamtdeis@gmail.com>
Date: Mon, 5 Dec 2016 19:23:28 +0000 (+0000)
Subject: Replace Linker::link() with LinkRenderer in all revisiondelete pages
X-Git-Tag: 1.31.0-rc.0~4646^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/categories/modifier.php?a=commitdiff_plain;h=870d05e4087e808b0193c143c44349809a8b7855;p=lhc%2Fweb%2Fwiklou.git

Replace Linker::link() with LinkRenderer in all revisiondelete pages

* RevDelArchiveItem
* RevDelArchivedFileItem
* RevDelFileItem
* RevDelLogItem
* RevDelRevisionItem

Bug: T149346
Change-Id: I96f83d06b4d3ccf3f76ccfca843a6aaf76d89063
---

diff --git a/includes/RevisionList.php b/includes/RevisionList.php
index fb444bdd3d..052fd16fe2 100644
--- a/includes/RevisionList.php
+++ b/includes/RevisionList.php
@@ -20,6 +20,8 @@
  * @file
  */
 
+use MediaWiki\MediaWikiServices;
+
 /**
  * List for revision table items for a single page
  */
@@ -268,6 +270,14 @@ abstract class RevisionItemBase {
 	 * This is used to show the list in HTML form, by the special page.
 	 */
 	abstract public function getHTML();
+
+	/**
+	 * Returns an instance of LinkRenderer
+	 * @return \MediaWiki\Linker\LinkRenderer
+	 */
+	protected function getLinkRenderer() {
+		return MediaWikiServices::getInstance()->getLinkRenderer();
+	}
 }
 
 class RevisionList extends RevisionListBase {
diff --git a/includes/revisiondelete/RevDelArchiveItem.php b/includes/revisiondelete/RevDelArchiveItem.php
index 2d0d6906b9..ab74dbd2bd 100644
--- a/includes/revisiondelete/RevDelArchiveItem.php
+++ b/includes/revisiondelete/RevDelArchiveItem.php
@@ -68,14 +68,14 @@ class RevDelArchiveItem extends RevDelRevisionItem {
 	}
 
 	protected function getRevisionLink() {
-		$date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
-			$this->revision->getTimestamp(), $this->list->getUser() ) );
+		$date = $this->list->getLanguage()->userTimeAndDate(
+			$this->revision->getTimestamp(), $this->list->getUser() );
 
 		if ( $this->isDeleted() && !$this->canViewContent() ) {
-			return $date;
+			return htmlspecialchars( $date );
 		}
 
-		return Linker::link(
+		return $this->getLinkRenderer()->makeLink(
 			SpecialPage::getTitleFor( 'Undelete' ),
 			$date,
 			[],
@@ -91,9 +91,9 @@ class RevDelArchiveItem extends RevDelRevisionItem {
 			return $this->list->msg( 'diff' )->escaped();
 		}
 
-		return Linker::link(
+		return $this->getLinkRenderer()->makeLink(
 			SpecialPage::getTitleFor( 'Undelete' ),
-			$this->list->msg( 'diff' )->escaped(),
+			$this->list->msg( 'diff' )->text(),
 			[],
 			[
 				'target' => $this->list->title->getPrefixedText(),
diff --git a/includes/revisiondelete/RevDelArchivedFileItem.php b/includes/revisiondelete/RevDelArchivedFileItem.php
index 52df2e3e73..decabbaafa 100644
--- a/includes/revisiondelete/RevDelArchivedFileItem.php
+++ b/includes/revisiondelete/RevDelArchivedFileItem.php
@@ -69,16 +69,16 @@ class RevDelArchivedFileItem extends RevDelFileItem {
 	}
 
 	protected function getLink() {
-		$date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
-			$this->file->getTimestamp(), $this->list->getUser() ) );
+		$date = $this->list->getLanguage()->userTimeAndDate(
+			$this->file->getTimestamp(), $this->list->getUser() );
 
 		# Hidden files...
 		if ( !$this->canViewContent() ) {
-			$link = $date;
+			$link = htmlspecialchars( $date );
 		} else {
 			$undelete = SpecialPage::getTitleFor( 'Undelete' );
 			$key = $this->file->getKey();
-			$link = Linker::link( $undelete, $date, [],
+			$link = $this->getLinkRenderer()->makeLink( $undelete, $date, [],
 				[
 					'target' => $this->list->title->getPrefixedText(),
 					'file' => $key,
diff --git a/includes/revisiondelete/RevDelFileItem.php b/includes/revisiondelete/RevDelFileItem.php
index ff01ceed5e..06b596ea66 100644
--- a/includes/revisiondelete/RevDelFileItem.php
+++ b/includes/revisiondelete/RevDelFileItem.php
@@ -116,19 +116,19 @@ class RevDelFileItem extends RevDelItem {
 	 * @return string
 	 */
 	protected function getLink() {
-		$date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
-			$this->file->getTimestamp(), $this->list->getUser() ) );
+		$date = $this->list->getLanguage()->userTimeAndDate(
+			$this->file->getTimestamp(), $this->list->getUser() );
 
 		if ( !$this->isDeleted() ) {
 			# Regular files...
-			return Html::rawElement( 'a', [ 'href' => $this->file->getUrl() ], $date );
+			return Html::element( 'a', [ 'href' => $this->file->getUrl() ], $date );
 		}
 
 		# Hidden files...
 		if ( !$this->canViewContent() ) {
-			$link = $date;
+			$link = htmlspecialchars( $date );
 		} else {
-			$link = Linker::link(
+			$link = $this->getLinkRenderer()->makeLink(
 				SpecialPage::getTitleFor( 'Revisiondelete' ),
 				$date,
 				[],
diff --git a/includes/revisiondelete/RevDelLogItem.php b/includes/revisiondelete/RevDelLogItem.php
index 1ea72715a5..9e76f4c62c 100644
--- a/includes/revisiondelete/RevDelLogItem.php
+++ b/includes/revisiondelete/RevDelLogItem.php
@@ -92,9 +92,9 @@ class RevDelLogItem extends RevDelItem {
 		$formatter->setAudience( LogFormatter::FOR_THIS_USER );
 
 		// Log link for this page
-		$loglink = Linker::link(
+		$loglink = $this->getLinkRenderer()->makeLink(
 			SpecialPage::getTitleFor( 'Log' ),
-			$this->list->msg( 'log' )->escaped(),
+			$this->list->msg( 'log' )->text(),
 			[],
 			[ 'page' => $title->getPrefixedText() ]
 		);
diff --git a/includes/revisiondelete/RevDelRevisionItem.php b/includes/revisiondelete/RevDelRevisionItem.php
index d7991135ec..7fff3666ea 100644
--- a/includes/revisiondelete/RevDelRevisionItem.php
+++ b/includes/revisiondelete/RevDelRevisionItem.php
@@ -107,14 +107,14 @@ class RevDelRevisionItem extends RevDelItem {
 	 * @return string
 	 */
 	protected function getRevisionLink() {
-		$date = htmlspecialchars( $this->list->getLanguage()->userTimeAndDate(
-			$this->revision->getTimestamp(), $this->list->getUser() ) );
+		$date = $this->list->getLanguage()->userTimeAndDate(
+			$this->revision->getTimestamp(), $this->list->getUser() );
 
 		if ( $this->isDeleted() && !$this->canViewContent() ) {
-			return $date;
+			return htmlspecialchars( $date );
 		}
 
-		return Linker::linkKnown(
+		return $this->getLinkRenderer()->makeKnownLink(
 			$this->list->title,
 			$date,
 			[],
@@ -134,9 +134,9 @@ class RevDelRevisionItem extends RevDelItem {
 		if ( $this->isDeleted() && !$this->canViewContent() ) {
 			return $this->list->msg( 'diff' )->escaped();
 		} else {
-			return Linker::linkKnown(
+			return $this->getLinkRenderer()->makeKnownLink(
 					$this->list->title,
-					$this->list->msg( 'diff' )->escaped(),
+					$this->list->msg( 'diff' )->text(),
 					[],
 					[
 						'diff' => $this->revision->getId(),