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

Merge "Fix default for $wgAbuseFilterAnonBlockDuration"

Browse source
This commit is contained in:
CSteipp 2013-02-25 18:23:23 +00:00 committed by Gerrit Code Review
parent aed0c1c6ac fdae51ec07
commit c35865b1ff
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
AbuseFilter.class.php
View file

@ -1187,7 +1187,13 @@ class AbuseFilter {
$block->prevents( 'createaccount', true );
$block->prevents( 'editownusertalk', false );
$expiry = $wgUser->isAnon() ? $wgAbuseFilterAnonBlockDuration : $wgAbuseFilterBlockDuration;
if ( $wgUser->isAnon() && $wgAbuseFilterAnonBlockDuration !== null ) {
// The user isn't logged in and the anon block duration doesn't default to $wgAbuseFilterBlockDuration
$expiry = $wgAbuseFilterAnonBlockDuration;
} else {
$expiry = $wgAbuseFilterBlockDuration;
}
$block->mExpiry = SpecialBlock::parseExpiryInput( $expiry );
$block->insert();

4
AbuseFilter.php
View file

@ -187,8 +187,8 @@ $wgAbuseFilterDisallowGlobalLocalBlocks = false;
// Block duration for logged in users
$wgAbuseFilterBlockDuration = 'indefinite';
// Block duration for anonymous users
$wgAbuseFilterAnonBlockDuration = $wgAbuseFilterBlockDuration;
// Block duration for anonymous users ($wgAbuseFilterBlockDuration will be used if null)
$wgAbuseFilterAnonBlockDuration = null;
// Callback functions for custom actions
$wgAbuseFilterCustomActionsHandlers = array();