Hoo man has uploaded a new change for review. https://gerrit.wikimedia.org/r/72716
Change subject: Don't trigger filter hits for nonexisting filter 0 ...................................................................... Don't trigger filter hits for nonexisting filter 0 AbuseFilter::getConsequencesForFilters uses filter ids as array keys, that causes problems if both local and global filters were hit, because array_merge reindexes arrays. Example: https://www.mediawiki.org/wiki/Special:AbuseLog/18687 Change-Id: I81cb110322461e30113199cfa313cd8e8e8b2262 --- M AbuseFilter.class.php 1 file changed, 1 insertion(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AbuseFilter refs/changes/16/72716/1 diff --git a/AbuseFilter.class.php b/AbuseFilter.class.php index 46a41a0..3eaf0bd 100644 --- a/AbuseFilter.class.php +++ b/AbuseFilter.class.php @@ -641,10 +641,7 @@ if ( count( $globalFilters ) ) { $fdb = wfGetDB( DB_SLAVE, array(), $wgAbuseFilterCentralDB ); - $consequences = array_merge( - $consequences, - self::loadConsequencesFromDB( $fdb, $globalFilters, 'global-' ) - ); + $consequences = $consequences + self::loadConsequencesFromDB( $fdb, $globalFilters, 'global-' ); } return $consequences; -- To view, visit https://gerrit.wikimedia.org/r/72716 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I81cb110322461e30113199cfa313cd8e8e8b2262 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AbuseFilter Gerrit-Branch: master Gerrit-Owner: Hoo man <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
