| Index: trunk/extensions/AbuseFilter/AbuseFilter.php |
| — | — | @@ -54,7 +54,8 @@ |
| 55 | 55 | $wgAbuseFilterAvailableActions = array( 'flag', 'throttle', 'warn', 'disallow', 'blockautopromote', 'block', 'degroup', 'rangeblock' ); |
| 56 | 56 | |
| 57 | 57 | // Conditions take about 4ms to check, so 100 conditions would take 400ms |
| 58 | | -$wgAbuseFilterConditionLimit = 1000; |
| | 58 | +// Currently, has no effect. |
| | 59 | +// $wgAbuseFilterConditionLimit = 1000; |
| 59 | 60 | |
| 60 | 61 | // Disable filters if they match more than X edits, constituting more than Y% of the last Z edits, if they have been changed in the last S seconds |
| 61 | 62 | $wgAbuseFilterEmergencyDisableThreshold = 0.50; |
| Index: trunk/extensions/AbuseFilter/AbuseFilter.class.php |
| — | — | @@ -235,7 +235,7 @@ |
| 236 | 236 | |
| 237 | 237 | // Threaten them a little bit |
| 238 | 238 | if (strlen($parameters[0])) { |
| 239 | | - $display .= call_user_func_array( 'wfMsgNoTrans', $parameters ) . "\n"; |
| | 239 | + $display .= wfMsgNoTrans( $parameters[0], $rule_desc ) . "\n"; |
| 240 | 240 | } else { |
| 241 | 241 | // Generic message. |
| 242 | 242 | $display .= wfMsgNoTrans( 'abusefilter-warning', $rule_desc ) ."<br />\n"; |
| — | — | @@ -253,7 +253,7 @@ |
| 254 | 254 | |
| 255 | 255 | // Don't let them do it |
| 256 | 256 | if (strlen($parameters[0])) { |
| 257 | | - $display .= call_user_func_array( 'wfMsgNoTrans', $parameters ) . "\n"; |
| | 257 | + $display .= wfMsgNoTrans( $parameters[0], $rule_desc ) . "\n"; |
| 258 | 258 | } else { |
| 259 | 259 | // Generic message. |
| 260 | 260 | $display .= wfMsgNoTrans( 'abusefilter-disallowed', $rule_desc ) ."<br />\n"; |