X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2Fpagers%2FDeletedContribsPager.php;h=a1f6b845069e03537d2fc56bc322a47389e3071a;hb=22806b0a4509e97b56fb52b387e17e3c80fb7eb2;hp=1acbba10703ed8e7c75be9130edb794a3d36e9e9;hpb=fc7d715b4b5adedd0ae3e9e6f969c89e19d460eb;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/pagers/DeletedContribsPager.php b/includes/specials/pagers/DeletedContribsPager.php
index 1acbba1070..a1f6b84506 100644
--- a/includes/specials/pagers/DeletedContribsPager.php
+++ b/includes/specials/pagers/DeletedContribsPager.php
@@ -22,6 +22,10 @@
 /**
  * @ingroup Pager
  */
+use MediaWiki\MediaWikiServices;
+use Wikimedia\Rdbms\ResultWrapper;
+use Wikimedia\Rdbms\FakeResultWrapper;
+
 class DeletedContribsPager extends IndexPager {
 
 	public $mDefaultDirection = IndexPager::DIR_DESCENDING;
@@ -39,7 +43,7 @@ class DeletedContribsPager extends IndexPager {
 		parent::__construct( $context );
 		$msgs = [ 'deletionlog', 'undeleteviewlink', 'diff' ];
 		foreach ( $msgs as $msg ) {
-			$this->messages[$msg] = $this->msg( $msg )->escaped();
+			$this->messages[$msg] = $this->msg( $msg )->text();
 		}
 		$this->target = $target;
 		$this->namespace = $namespace;
@@ -57,7 +61,7 @@ class DeletedContribsPager extends IndexPager {
 		list( $index, $userCond ) = $this->getUserCond();
 		$conds = array_merge( $userCond, $this->getNamespaceCond() );
 		$user = $this->getUser();
-		// Paranoia: avoid brute force searches (bug 17792)
+		// Paranoia: avoid brute force searches (T19792)
 		if ( !$user->isAllowed( 'deletedhistory' ) ) {
 			$conds[] = $this->mDb->bitAnd( 'ar_deleted', Revision::DELETED_USER ) . ' = 0';
 		} elseif ( !$user->isAllowedAny( 'suppressrevision', 'viewsuppressed' ) ) {
@@ -240,6 +244,8 @@ class DeletedContribsPager extends IndexPager {
 	function formatRevisionRow( $row ) {
 		$page = Title::makeTitle( $row->ar_namespace, $row->ar_title );
 
+		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+
 		$rev = new Revision( [
 			'title' => $page,
 			'id' => $row->ar_rev_id,
@@ -254,7 +260,7 @@ class DeletedContribsPager extends IndexPager {
 		$undelete = SpecialPage::getTitleFor( 'Undelete' );
 
 		$logs = SpecialPage::getTitleFor( 'Log' );
-		$dellog = Linker::linkKnown(
+		$dellog = $linkRenderer->makeKnownLink(
 			$logs,
 			$this->messages['deletionlog'],
 			[],
@@ -264,7 +270,7 @@ class DeletedContribsPager extends IndexPager {
 			]
 		);
 
-		$reviewlink = Linker::linkKnown(
+		$reviewlink = $linkRenderer->makeKnownLink(
 			SpecialPage::getTitleFor( 'Undelete', $page->getPrefixedDBkey() ),
 			$this->messages['undeleteviewlink']
 		);
@@ -272,7 +278,7 @@ class DeletedContribsPager extends IndexPager {
 		$user = $this->getUser();
 
 		if ( $user->isAllowed( 'deletedtext' ) ) {
-			$last = Linker::linkKnown(
+			$last = $linkRenderer->makeKnownLink(
 				$undelete,
 				$this->messages['diff'],
 				[],
@@ -283,17 +289,16 @@ class DeletedContribsPager extends IndexPager {
 				]
 			);
 		} else {
-			$last = $this->messages['diff'];
+			$last = htmlspecialchars( $this->messages['diff'] );
 		}
 
 		$comment = Linker::revComment( $rev );
 		$date = $this->getLanguage()->userTimeAndDate( $rev->getTimestamp(), $user );
-		$date = htmlspecialchars( $date );
 
 		if ( !$user->isAllowed( 'undelete' ) || !$rev->userCan( Revision::DELETED_TEXT, $user ) ) {
-			$link = $date; // unusable link
+			$link = htmlspecialchars( $date ); // unusable link
 		} else {
-			$link = Linker::linkKnown(
+			$link = $linkRenderer->makeKnownLink(
 				$undelete,
 				$date,
 				[ 'class' => 'mw-changeslist-date' ],
@@ -308,7 +313,7 @@ class DeletedContribsPager extends IndexPager {
 			$link = '<span class="history-deleted">' . $link . '</span>';
 		}
 
-		$pagelink = Linker::link(
+		$pagelink = $linkRenderer->makeLink(
 			$page,
 			null,
 			[ 'class' => 'mw-changeslist-title' ]