Hoo man has submitted this change and it was merged.
Change subject: Check against $wgAbuseFilterRestrictedActions instead of
hardcoded list for block actions
......................................................................
Check against $wgAbuseFilterRestrictedActions instead of hardcoded list for
block actions
Currently $wgAbuseFilterDisallowGlobalLocalBlocks checks against a
hardcoded list for "block actions", which means that extensions
like GlobalBlocking cannot add actions to it.
Change-Id: I6ac5125782cf0029447948d6d0080103700e397c
---
M AbuseFilter.class.php
M AbuseFilter.php
2 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
Hoo man: Verified; Looks good to me, approved
diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php
index 41c1636..a322d47 100644
--- a/AbuseFilter.class.php
+++ b/AbuseFilter.class.php
@@ -688,21 +688,15 @@
*/
public static function executeFilterActions( $filters, $title, $vars ) {
wfProfileIn( __METHOD__ );
- static $blockingActions = array(
- 'block',
- 'rangeblock',
- 'degroup',
- 'blockautopromote'
- );
$actionsByFilter = self::getConsequencesForFilters( $filters );
$actionsTaken = array_fill_keys( $filters, array() );
$messages = array();
+ global $wgOut, $wgAbuseFilterDisallowGlobalLocalBlocks,
$wgAbuseFilterRestrictedActions;
foreach ( $actionsByFilter as $filter => $actions ) {
// Special-case handling for warnings.
- global $wgOut, $wgAbuseFilterDisallowGlobalLocalBlocks;
$parsed_public_comments = $wgOut->parseInline(
self::$filters[$filter]->af_public_comments );
@@ -729,7 +723,7 @@
}
if ( $wgAbuseFilterDisallowGlobalLocalBlocks &&
$global_filter ) {
- foreach ( $blockingActions as $blockingAction )
{
+ foreach ( $wgAbuseFilterRestrictedActions as
$blockingAction ) {
unset( $actions[$blockingAction] );
}
}
@@ -760,7 +754,7 @@
}
// prevent double warnings
- if ( count( array_intersect( array_keys( $actions ),
$blockingActions ) ) > 0 &&
+ if ( count( array_intersect( array_keys( $actions ),
$wgAbuseFilterRestrictedActions ) ) > 0 &&
!empty( $actions['disallow'] ) ) {
unset( $actions['disallow'] );
}
diff --git a/AbuseFilter.php b/AbuseFilter.php
index d5f0a76..8b1a986 100644
--- a/AbuseFilter.php
+++ b/AbuseFilter.php
@@ -170,7 +170,7 @@
// Abuse filter parser class
$wgAbuseFilterParserClass = 'AbuseFilterParser';
-$wgAbuseFilterRestrictedActions = array( 'block', 'degroup' );
+$wgAbuseFilterRestrictedActions = array( 'block', 'degroup',
'blockautopromote', 'rangeblock' );
// Abuse filter hit notification (available options: rc, udp, rcandudp)
$wgAbuseFilterNotifications = false;
--
To view, visit https://gerrit.wikimedia.org/r/48096
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6ac5125782cf0029447948d6d0080103700e397c
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
