diff options
| author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2023-11-06 15:59:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@wikimedia.org> | 2023-11-06 15:59:21 +0000 |
| commit | ab7cbca00ee80f8eac84b266883bec7d710557c6 (patch) | |
| tree | 04b06d64ffce1a4ffc2aedf4dddaeb4be31cfcdf /includes/user/User.php | |
| parent | 63105a269503bbc0d1820b6e7f14faad87e200f8 (diff) | |
| parent | cc40f0a12d1e6feb124c04e822035ead222d6362 (diff) | |
| download | mediawikicore-ab7cbca00ee80f8eac84b266883bec7d710557c6.tar.gz mediawikicore-ab7cbca00ee80f8eac84b266883bec7d710557c6.zip | |
Merge "Migrate callers of DatabaseBlock methods moved to DatabaseBlockStore"
Diffstat (limited to 'includes/user/User.php')
| -rw-r--r-- | includes/user/User.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/includes/user/User.php b/includes/user/User.php index 03711fd4e43d..b2c72ebeb282 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -34,7 +34,6 @@ use MediaWiki\Auth\AuthenticationRequest; use MediaWiki\Auth\AuthManager; use MediaWiki\Block\AbstractBlock; use MediaWiki\Block\Block; -use MediaWiki\Block\DatabaseBlock; use MediaWiki\Block\SystemBlock; use MediaWiki\CommentStore\CommentStoreComment; use MediaWiki\DAO\WikiAwareEntityTrait; @@ -2790,12 +2789,14 @@ class User implements Authority, UserIdentity, UserEmailContact { return false; } - $userblock = DatabaseBlock::newFromTarget( $this->getName() ); + $blockStore = MediaWikiServices::getInstance()->getDatabaseBlockStore(); + + $userblock = $blockStore->newFromTarget( $this->getName() ); if ( !$userblock ) { return false; } - return (bool)$userblock->doAutoblock( $this->getRequest()->getIP() ); + return (bool)$blockStore->doAutoblock( $userblock, $this->getRequest()->getIP() ); } /** |