X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fspecials%2Fpagers%2FDeletedContribsPager.php;h=2893759eae7074f383c901fec4b0f787316cb2a0;hb=e19e6bfabcaf2b6aa5dd837ff7057bd6a25baef8;hp=2f40aceaa817155a8bc8d7618ee6e687d5dd69af;hpb=cc41773f61c23b922fe4cfc513b105ec4d32eeec;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/specials/pagers/DeletedContribsPager.php b/includes/specials/pagers/DeletedContribsPager.php
index 2f40aceaa8..2893759eae 100644
--- a/includes/specials/pagers/DeletedContribsPager.php
+++ b/includes/specials/pagers/DeletedContribsPager.php
@@ -22,6 +22,7 @@
 /**
  * @ingroup Pager
  */
+use MediaWiki\Linker\LinkRenderer;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Storage\RevisionRecord;
 use Wikimedia\Rdbms\IDatabase;
@@ -60,8 +61,10 @@ class DeletedContribsPager extends IndexPager {
 	 */
 	protected $mNavigationBar;
 
-	public function __construct( IContextSource $context, $target, $namespace = false ) {
-		parent::__construct( $context );
+	public function __construct( IContextSource $context, $target, $namespace = false,
+		LinkRenderer $linkRenderer
+	) {
+		parent::__construct( $context, $linkRenderer );
 		$msgs = [ 'deletionlog', 'undeleteviewlink', 'diff' ];
 		foreach ( $msgs as $msg ) {
 			$this->messages[$msg] = $this->msg( $msg )->text();
@@ -87,13 +90,11 @@ class DeletedContribsPager extends IndexPager {
 		];
 		$conds = array_merge( $userCond, $this->getNamespaceCond() );
 		$user = $this->getUser();
+		$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 		// Paranoia: avoid brute force searches (T19792)
-		if ( !$user->isAllowed( 'deletedhistory' ) ) {
+		if ( !$permissionManager->userHasRight( $user, 'deletedhistory' ) ) {
 			$conds[] = $this->mDb->bitAnd( 'ar_deleted', RevisionRecord::DELETED_USER ) . ' = 0';
-		} elseif ( !MediaWikiServices::getInstance()
-			->getPermissionManager()
-			->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' )
-		) {
+		} elseif ( !$permissionManager->userHasAnyRight( $user, 'suppressrevision', 'viewsuppressed' ) ) {
 			$conds[] = $this->mDb->bitAnd( 'ar_deleted', RevisionRecord::SUPPRESSED_USER ) .
 				' != ' . RevisionRecord::SUPPRESSED_USER;
 		}
@@ -289,7 +290,7 @@ class DeletedContribsPager extends IndexPager {
 	function formatRevisionRow( $row ) {
 		$page = Title::makeTitle( $row->ar_namespace, $row->ar_title );
 
-		$linkRenderer = MediaWikiServices::getInstance()->getLinkRenderer();
+		$linkRenderer = $this->getLinkRenderer();
 
 		$rev = new Revision( [
 			'title' => $page,
@@ -322,8 +323,9 @@ class DeletedContribsPager extends IndexPager {
 		);
 
 		$user = $this->getUser();
+		$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
 
-		if ( $user->isAllowed( 'deletedtext' ) ) {
+		if ( $permissionManager->userHasRight( $user, 'deletedtext' ) ) {
 			$last = $linkRenderer->makeKnownLink(
 				$undelete,
 				$this->messages['diff'],
@@ -341,7 +343,9 @@ class DeletedContribsPager extends IndexPager {
 		$comment = Linker::revComment( $rev );
 		$date = $this->getLanguage()->userTimeAndDate( $rev->getTimestamp(), $user );
 
-		if ( !$user->isAllowed( 'undelete' ) || !$rev->userCan( RevisionRecord::DELETED_TEXT, $user ) ) {
+		if ( !$permissionManager->userHasRight( $user, 'undelete' ) ||
+			 !$rev->userCan( RevisionRecord::DELETED_TEXT, $user )
+		) {
 			$link = htmlspecialchars( $date ); // unusable link
 		} else {
 			$link = $linkRenderer->makeKnownLink(