| Index: trunk/extensions/AbuseFilter/AbuseFilter.php |
| — | — | @@ -141,7 +141,7 @@ |
| 142 | 142 | ), |
| 143 | 143 | ) + $commonModuleInfo; |
| 144 | 144 | |
| 145 | | -$wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag' ); |
| | 145 | +$wgAbuseFilterAvailableActions = array( 'flag', 'hidedetails', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'tag' ); |
| 146 | 146 | |
| 147 | 147 | $wgAbuseFilterConditionLimit = 1000; |
| 148 | 148 | |
| — | — | @@ -153,7 +153,7 @@ |
| 154 | 154 | // Abuse filter parser class |
| 155 | 155 | $wgAbuseFilterParserClass = 'AbuseFilterParser'; |
| 156 | 156 | |
| 157 | | -$wgAbuseFilterRestrictedActions = array( 'block', 'degroup' ); |
| | 157 | +$wgAbuseFilterRestrictedActions = array( 'block', 'degroup', 'hidedetails' ); |
| 158 | 158 | |
| 159 | 159 | // UDP configuration |
| 160 | 160 | $wgAbuseFilterUDPPrefix = 'abusefilter:'; |
| Index: trunk/extensions/AbuseFilter/AbuseFilter.class.php |
| — | — | @@ -730,6 +730,7 @@ |
| 731 | 731 | $thisLog['afl_filter'] = $filter; |
| 732 | 732 | $thisLog['afl_action'] = $action; |
| 733 | 733 | $thisLog['afl_actions'] = implode( ',', $actions ); |
| | 734 | + $thisLog['afl_deleted'] = in_array('hidedetails', $actions) ? 1 : 0; |
| 734 | 735 | |
| 735 | 736 | // Don't log if we were only throttling. |
| 736 | 737 | if ( $thisLog['afl_actions'] != 'throttle' ) { |
| — | — | @@ -935,7 +936,7 @@ |
| 936 | 937 | $vars, $rule_desc ) |
| 937 | 938 | { |
| 938 | 939 | global $wgAbuseFilterCustomActionsHandlers; |
| 939 | | - |
| | 940 | + |
| 940 | 941 | $display = ''; |
| 941 | 942 | switch ( $action ) { |
| 942 | 943 | case 'disallow': |
| Index: trunk/extensions/AbuseFilter/AbuseFilter.i18n.php |
| — | — | @@ -193,6 +193,7 @@ |
| 194 | 194 | 'abusefilter-edit-action-warn' => 'Trigger these actions after giving the user a warning', |
| 195 | 195 | 'abusefilter-edit-action-disallow' => 'Prevent the user from performing the action in question', |
| 196 | 196 | 'abusefilter-edit-action-flag' => 'Flag the edit in the abuse log', |
| | 197 | + 'abusefilter-edit-action-hidedetails' => 'Hide entries in the abuse log', |
| 197 | 198 | 'abusefilter-edit-action-blockautopromote' => "Revoke the user's autoconfirmed status", |
| 198 | 199 | 'abusefilter-edit-action-degroup' => 'Remove the user from all privileged groups', |
| 199 | 200 | 'abusefilter-edit-action-block' => 'Block the user and/or IP address from editing', |
| — | — | @@ -377,6 +378,7 @@ |
| 378 | 379 | 'abusefilter-action-degroup' => 'Remove from groups', |
| 379 | 380 | 'abusefilter-action-rangeblock' => 'Range-block', |
| 380 | 381 | 'abusefilter-action-disallow' => 'Disallow', |
| | 382 | + 'abusefilter-action-hidedetails' => 'Hide log entries', |
| 381 | 383 | |
| 382 | 384 | // Revert interface |
| 383 | 385 | 'abusefilter-revert-title' => 'Revert all changes by filter $1', |
| — | — | @@ -678,6 +680,7 @@ |
| 679 | 681 | 'abusefilter-edit-action-warn' => 'Checkbox label for filter action.', |
| 680 | 682 | 'abusefilter-edit-action-disallow' => 'Checkbox label for filter action.', |
| 681 | 683 | 'abusefilter-edit-action-flag' => 'Checkbox label for filter action.', |
| | 684 | + 'abusefilter-edit-action-hidedetails' => 'Checkbox label for filter action.', |
| 682 | 685 | 'abusefilter-edit-action-blockautopromote' => 'Checkbox label for filter action.', |
| 683 | 686 | 'abusefilter-edit-action-degroup' => 'Checkbox label for filter action.', |
| 684 | 687 | 'abusefilter-edit-action-block' => 'Checkbox label for filter action.', |