wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 02:38:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't add a log entry if the block wasn't inserted

Browse source 
$block->insert() would fail if there was an existing block
so these are not really inserted.
See for example:
https://www.mediawiki.org/w/index.php?title=Special:Log/block&page=User%3ARohitverma1

Change-Id: If2c4b34a97a0de9d9efc8b650881f04306c74915
This commit is contained in:
Glaisher 2015-10-20 22:44:10 +05:00
parent a0119c4e66
commit 8f2029b1ea
1 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
AbuseFilter.class.php
View file

@ -1206,25 +1206,24 @@ class AbuseFilter {
}
$block->mExpiry = SpecialBlock::parseExpiryInput( $expiry );
$block->insert();
if ( $block->insert() ) {
// Log it if successful
# Prepare log parameters
$logParams = array();
if ( $block->mExpiry == 'infinity' ) {
$logParams[] = 'indefinite';
} else {
$logParams[] = $expiry;
}
$logParams[] = 'nocreate';
// Log it
# Prepare log parameters
$logParams = array();
if ( $block->mExpiry == 'infinity' ) {
$logParams[] = 'indefinite';
} else {
$logParams[] = $expiry;
$log = new LogPage( 'block' );
$log->addEntry( 'block',
Title::makeTitle( NS_USER, $wgUser->getName() ),
wfMessage( 'abusefilter-blockreason', $rule_desc, $rule_number )->inContentLanguage()->text(),
$logParams, self::getFilterUser()
);
}
$logParams[] = 'nocreate';
$log = new LogPage( 'block' );
$log->addEntry( 'block',
Title::makeTitle( NS_USER, $wgUser->getName() ),
wfMessage( 'abusefilter-blockreason', $rule_desc, $rule_number )->inContentLanguage()->text(),
$logParams, self::getFilterUser()
);
$message = array(
'abusefilter-blocked-display',
$rule_desc,
@ -1250,20 +1249,19 @@ class AbuseFilter {
$block->prevents( 'editownusertalk', false );
$block->mExpiry = SpecialBlock::parseExpiryInput( '1 week' );
$block->insert();
// Log it
# Prepare log parameters
$logParams = array();
$logParams[] = 'indefinite';
$logParams[] = 'nocreate';
$log = new LogPage( 'block' );
$log->addEntry( 'block', Title::makeTitle( NS_USER, $range ),
wfMessage( 'abusefilter-blockreason', $rule_desc, $rule_number )->inContentLanguage()->text(),
$logParams, self::getFilterUser()
);
if ( $block->insert() ) {
// Log it if the block was successful
# Prepare log parameters
$logParams = array();
$logParams[] = 'indefinite';
$logParams[] = 'nocreate';
$log = new LogPage( 'block' );
$log->addEntry( 'block', Title::makeTitle( NS_USER, $range ),
wfMessage( 'abusefilter-blockreason', $rule_desc, $rule_number )->inContentLanguage()->text(),
$logParams, self::getFilterUser()
);
}
$message = array(
'abusefilter-blocked-display',
$rule_desc,