aboutsummaryrefslogtreecommitdiffstats
path: root/includes/block/BlockUser.php
diff options
context:
space:
mode:
authordaniel <dkinzler@wikimedia.org>2021-04-16 14:55:24 +0200
committerdaniel <dkinzler@wikimedia.org>2021-05-11 11:36:11 +0200
commit753b1bcaffa3b575d91b31ec20ba4fa420009813 (patch)
tree0ee7fd54706a4edc2979cac5e5a4f3c99f7c195d /includes/block/BlockUser.php
parentb6fea9934146a76fea1f887ab6022d53f7d30995 (diff)
downloadmediawikicore-753b1bcaffa3b575d91b31ec20ba4fa420009813.tar.gz
mediawikicore-753b1bcaffa3b575d91b31ec20ba4fa420009813.zip
Introduce Block interface and replace AbstractBlock.
In order to allow Authority to know about user blocks, we need a narrow interface to represent such blocks. This deprecates some methods on AbstractBlocks in favor of new methods on the Block interface that avoid binding to the User class. Bug: T271494 Change-Id: I7bb950533970984a014de0434518fbbefb695131
Diffstat (limited to 'includes/block/BlockUser.php')
-rw-r--r--includes/block/BlockUser.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/block/BlockUser.php b/includes/block/BlockUser.php
index 8555f8a2dfb4..04f5f90c5057 100644
--- a/includes/block/BlockUser.php
+++ b/includes/block/BlockUser.php
@@ -559,12 +559,12 @@ class BlockUser {
if ( $priorBlock === null ) {
$this->logger->warning( 'Block could not be inserted. No existing block was found.' );
- return Status::newFatal( 'ipb-block-not-found', $block->getTarget() );
+ return Status::newFatal( 'ipb-block-not-found', $block->getTargetName() );
}
if ( $block->equals( $priorBlock ) ) {
// Block settings are equal => user is already blocked
- return Status::newFatal( 'ipb_already_blocked', $block->getTarget() );
+ return Status::newFatal( 'ipb_already_blocked', $block->getTargetName() );
}
$currentBlock = $this->configureBlock( $priorBlock );
@@ -572,7 +572,7 @@ class BlockUser {
$isReblock = true;
$block = $currentBlock;
} else {
- return Status::newFatal( 'ipb_already_blocked', $block->getTarget() );
+ return Status::newFatal( 'ipb_already_blocked', $block->getTargetName() );
}
}