r107456 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r107455‎ | r107456 | r107457 >
Date:00:48, 28 December 2011
Author:mah
Status:ok
Tags:
Comment:
Revert r107454 based on concerns raised by Prodego.
Modified paths:
  • /trunk/extensions/AbuseFilter/AbuseFilter.class.php (modified) (history)
  • /trunk/extensions/AbuseFilter/AbuseFilter.php (modified) (history)

Diff [purge]

Index: trunk/extensions/AbuseFilter/AbuseFilter.php
@@ -141,7 +141,7 @@
142142 ),
143143 ) + $commonModuleInfo;
144144
145 -$wgAbuseFilterAvailableActions = array( 'flag', 'hidedetails', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag' );
 145+$wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag' );
146146
147147 $wgAbuseFilterConditionLimit = 1000;
148148
@@ -153,7 +153,7 @@
154154 // Abuse filter parser class
155155 $wgAbuseFilterParserClass = 'AbuseFilterParser';
156156
157 -$wgAbuseFilterRestrictedActions = array( 'block', 'degroup', 'hidedetails' );
 157+$wgAbuseFilterRestrictedActions = array( 'block', 'degroup' );
158158
159159 // UDP configuration
160160 $wgAbuseFilterUDPPrefix = 'abusefilter:';
@@ -169,4 +169,3 @@
170170
171171 // Callback functions for custom actions
172172 $wgAbuseFilterCustomActionsHandlers = array();
173 -
Index: trunk/extensions/AbuseFilter/AbuseFilter.class.php
@@ -730,7 +730,6 @@
731731 $thisLog['afl_filter'] = $filter;
732732 $thisLog['afl_action'] = $action;
733733 $thisLog['afl_actions'] = implode( ',', $actions );
734 - $thisLog['afl_deleted'] = in_array('hidedetails', $actions) ? 1 : 0;
735734
736735 // Don't log if we were only throttling.
737736 if ( $thisLog['afl_actions'] != 'throttle' ) {

Follow-up revisions

RevisionCommit summaryAuthorDate
r107472Fix half done revert of r107456 which was a revert of r107454raymond08:58, 28 December 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r107454Fix Bug 33380 - Details of actions caught by a private filter should be private...mah00:26, 28 December 2011

Status & tagging log