break;
case 'actor':
// Make sure this thread sees its own changes
- if ( wfGetLB()->hasOrMadeRecentMasterChanges() ) {
+ $lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
+ if ( $lb->hasOrMadeRecentMasterChanges() ) {
$flags |= self::READ_LATEST;
$this->queryFlagsUsed = $flags;
}
* site.
*
* @param string $val Input value to compare
- * @param string $salt Optional function-specific data for hashing
+ * @param string|array $salt Optional function-specific data for hashing
* @param WebRequest|null $request Object to use or null to use $wgRequest
* @param int $maxage Fail tokens older than this, in seconds
* @return bool Whether the token matches
* ignoring the suffix.
*
* @param string $val Input value to compare
- * @param string $salt Optional function-specific data for hashing
+ * @param string|array $salt Optional function-specific data for hashing
* @param WebRequest|null $request Object to use or null to use $wgRequest
* @param int $maxage Fail tokens older than this, in seconds
* @return bool Whether the token matches
/**
* Checks if two user objects point to the same user.
*
- * @since 1.25
- * @param User $user
+ * @since 1.25 ; takes a UserIdentity instead of a User since 1.32
+ * @param UserIdentity $user
* @return bool
*/
- public function equals( User $user ) {
+ public function equals( UserIdentity $user ) {
+ // XXX it's not clear whether central ID providers are supposed to obey this
return $this->getName() === $user->getName();
}
}