From: Derick Alangi <alangiderick@gmail.com>
Date: Sun, 21 Jul 2019 14:15:46 +0000 (+0100)
Subject: action: Avoid use of deprecated Revision::* constants, use RevisionRecord
X-Git-Tag: 1.34.0-rc.0~929
X-Git-Url: https://git.heureux-cyclage.org/?a=commitdiff_plain;h=90c6954645177652fa1b9bdd904b3d67cf6e0152;p=lhc%2Fweb%2Fwiklou.git

action: Avoid use of deprecated Revision::* constants, use RevisionRecord

Change-Id: I09e3182cd83977d143ca7b34b791ea2cd0df0ef8
---

diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index f8ba08c3ba..279c13bd04 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -23,6 +23,7 @@
  */
 
 use MediaWiki\MediaWikiServices;
+use MediaWiki\Storage\RevisionRecord;
 use Wikimedia\Rdbms\Database;
 
 /**
@@ -543,7 +544,7 @@ class InfoAction extends FormlessAction {
 		$batch = new LinkBatch;
 
 		if ( $firstRev ) {
-			$firstRevUser = $firstRev->getUserText( Revision::FOR_THIS_USER );
+			$firstRevUser = $firstRev->getUserText( RevisionRecord::FOR_THIS_USER );
 			if ( $firstRevUser !== '' ) {
 				$firstRevUserTitle = Title::makeTitle( NS_USER, $firstRevUser );
 				$batch->addObj( $firstRevUserTitle );
@@ -552,7 +553,7 @@ class InfoAction extends FormlessAction {
 		}
 
 		if ( $lastRev ) {
-			$lastRevUser = $lastRev->getUserText( Revision::FOR_THIS_USER );
+			$lastRevUser = $lastRev->getUserText( RevisionRecord::FOR_THIS_USER );
 			if ( $lastRevUser !== '' ) {
 				$lastRevUserTitle = Title::makeTitle( NS_USER, $lastRevUser );
 				$batch->addObj( $lastRevUserTitle );
diff --git a/includes/actions/RollbackAction.php b/includes/actions/RollbackAction.php
index e2fc265f96..519da617ba 100644
--- a/includes/actions/RollbackAction.php
+++ b/includes/actions/RollbackAction.php
@@ -20,6 +20,8 @@
  * @ingroup Actions
  */
 
+use MediaWiki\Storage\RevisionRecord;
+
 /**
  * User interface for the rollback action
  *
@@ -167,8 +169,8 @@ class RollbackAction extends FormAction {
 		$this->getOutput()->addHTML(
 			$this->msg( 'rollback-success' )
 				->rawParams( $old, $new )
-				->params( $current->getUserText( Revision::FOR_THIS_USER, $user ) )
-				->params( $target->getUserText( Revision::FOR_THIS_USER, $user ) )
+				->params( $current->getUserText( RevisionRecord::FOR_THIS_USER, $user ) )
+				->params( $target->getUserText( RevisionRecord::FOR_THIS_USER, $user ) )
 				->parseAsBlock()
 		);
 
diff --git a/includes/actions/pagers/HistoryPager.php b/includes/actions/pagers/HistoryPager.php
index 5ef6e77b31..c5c090d21b 100644
--- a/includes/actions/pagers/HistoryPager.php
+++ b/includes/actions/pagers/HistoryPager.php
@@ -339,7 +339,9 @@ class HistoryPager extends ReverseChronologicalPager {
 			$this->preventClickjacking();
 			// If revision was hidden from sysops and we don't need the checkbox
 			// for anything else, disable it
-			if ( !$this->showTagEditUI && !$rev->userCan( Revision::DELETED_RESTRICTED, $user ) ) {
+			if ( !$this->showTagEditUI
+				&& !$rev->userCan( RevisionRecord::DELETED_RESTRICTED, $user )
+			) {
 				$del = Xml::check( 'deleterevisions', false, [ 'disabled' => 'disabled' ] );
 			// Otherwise, enable the checkbox...
 			} else {
@@ -349,14 +351,14 @@ class HistoryPager extends ReverseChronologicalPager {
 		// User can only view deleted revisions...
 		} elseif ( $rev->getVisibility() && $user->isAllowed( 'deletedhistory' ) ) {
 			// If revision was hidden from sysops, disable the link
-			if ( !$rev->userCan( Revision::DELETED_RESTRICTED, $user ) ) {
+			if ( !$rev->userCan( RevisionRecord::DELETED_RESTRICTED, $user ) ) {
 				$del = Linker::revDeleteLinkDisabled( false );
 			// Otherwise, show the link...
 			} else {
 				$query = [ 'type' => 'revision',
 					'target' => $this->getTitle()->getPrefixedDBkey(), 'ids' => $rev->getId() ];
 				$del .= Linker::revDeleteLink( $query,
-					$rev->isDeleted( Revision::DELETED_RESTRICTED ), false );
+					$rev->isDeleted( RevisionRecord::DELETED_RESTRICTED ), false );
 			}
 		}
 		if ( $del ) {