wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-27 15:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Clean up Throttle::throttleIdentifier"

Browse source
This commit is contained in:
jenkins-bot 2021-07-30 01:37:24 +00:00 committed by Gerrit Code Review
parent 122862cedc 83794d7cb4
commit ca31a12be4
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
includes/Consequences/Consequence/Throttle.php
View file

@ -187,7 +187,7 @@ class Throttle extends Consequence implements ConsequencesDisablerConsequence {
break;
case 'editcount':
// Hack for detecting different single-purpose accounts.
$identifier = $user->isRegistered() ? $this->userEditTracker->getUserEditCount( $user ) : 0;
$identifier = $this->userEditTracker->getUserEditCount( $user ) ?: 0;
break;
case 'site':
$identifier = 1;
@ -203,7 +203,6 @@ class Throttle extends Consequence implements ConsequencesDisablerConsequence {
// @codeCoverageIgnoreEnd
}
// @phan-suppress-next-line PhanTypeMismatchReturnNullable Simplify 'editcount' in 1.37+
return $identifier;
}
}

4
includes/Variables/LazyVariableComputer.php
View file

@ -308,9 +308,7 @@ class LazyVariableComputer {
case 'user-editcount':
/** @var UserIdentity $userIdentity */
$userIdentity = $parameters['user-identity'];
$result = $userIdentity->isRegistered()
? $this->userEditTracker->getUserEditCount( $userIdentity )
: null;
$result = $this->userEditTracker->getUserEditCount( $userIdentity );
break;
case 'user-emailconfirm':
/** @var User $user */