From 40c88a6ac9f046a64c497f2955e8a3b874374a30 Mon Sep 17 00:00:00 2001 From: Derick Alangi Date: Thu, 25 Jul 2019 13:47:57 +0100 Subject: [PATCH] changes: Avoid use of deprecated method Revision::userCanBitfield() Revision::userCanBitfield() is deprecated and RevisionRecord should be used instead. Change-Id: I0d6ad6863be520d3264809be69532dfb2e3dab9a --- includes/changes/ChangesList.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php index d97abca494..31b44430e8 100644 --- a/includes/changes/ChangesList.php +++ b/includes/changes/ChangesList.php @@ -662,15 +662,20 @@ class ChangesList extends ContextSource { * field of this revision, if it's marked as deleted. * @param RCCacheEntry|RecentChange $rc * @param int $field - * @param User|null $user User object to check, or null to use $wgUser + * @param User|null $user User object to check against. If null, the global RequestContext's + * User is assumed instead. * @return bool */ public static function userCan( $rc, $field, User $user = null ) { + if ( $user === null ) { + $user = RequestContext::getMain()->getUser(); + } + if ( $rc->mAttribs['rc_type'] == RC_LOG ) { return LogEventsList::userCanBitfield( $rc->mAttribs['rc_deleted'], $field, $user ); - } else { - return Revision::userCanBitfield( $rc->mAttribs['rc_deleted'], $field, $user ); } + + return RevisionRecord::userCanBitfield( $rc->mAttribs['rc_deleted'], $field, $user ); } /** -- 2.20.1