Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add any prior block to BlockIpComplete hook"

Browse source
This commit is contained in:
jenkins-bot 2016-07-12 18:06:51 +00:00 committed by Gerrit Code Review
commit 52017fad77
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/hooks.txt
View file

@ -903,6 +903,7 @@ $image: File
'BlockIpComplete': After an IP address or user is blocked.
$block: the Block object that was saved
$user: the user who did the block (not the one being blocked)
$priorBlock: the Block object for the prior block or null if there was none
'BookInformation': Before information output on Special:Booksources.
$isbn: ISBN to show information for

8
includes/specials/SpecialBlock.php
View file

@ -645,8 +645,10 @@ class SpecialBlock extends FormSpecialPage {
return [ 'ipb-blockingself', 'ipb-confirmaction' ];
}
} elseif ( $type == Block::TYPE_RANGE ) {
$user = null;
$userId = 0;
} elseif ( $type == Block::TYPE_IP ) {
$user = null;
$target = $target->getName();
$userId = 0;
} else {
@ -729,6 +731,7 @@ class SpecialBlock extends FormSpecialPage {
return $reason;
}
$priorBlock = null;
# Try to insert block. Is there a conflicting block?
$status = $block->insert();
if ( !$status ) {
@ -748,17 +751,16 @@ class SpecialBlock extends FormSpecialPage {
# This returns direct blocks before autoblocks/rangeblocks, since we should
# be sure the user is blocked by now it should work for our purposes
$currentBlock = Block::newFromTarget( $target );
if ( $block->equals( $currentBlock ) ) {
return [ [ 'ipb_already_blocked', $block->getTarget() ] ];
}
# If the name was hidden and the blocking user cannot hide
# names, then don't allow any block changes...
if ( $currentBlock->mHideName && !$performer->isAllowed( 'hideuser' ) ) {
return [ 'cant-see-hidden-user' ];
}
$priorBlock = clone $currentBlock;
$currentBlock->isHardblock( $block->isHardblock() );
$currentBlock->prevents( 'createaccount', $block->prevents( 'createaccount' ) );
$currentBlock->mExpiry = $block->mExpiry;
@ -786,7 +788,7 @@ class SpecialBlock extends FormSpecialPage {
$logaction = 'block';
}
Hooks::run( 'BlockIpComplete', [ $block, $performer ] );
Hooks::run( 'BlockIpComplete', [ $block, $performer, $priorBlock ] );
# Set *_deleted fields if requested
if ( $data['HideUser'] ) {