https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102197
Revision: 102197
Author: cryptocoryne
Date: 2011-11-06 21:05:03 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Followup r102138 -- fixes according to Werdna's comment
Modified Paths:
--------------
trunk/extensions/AbuseFilter/AbuseFilter.class.php
trunk/extensions/AbuseFilter/AbuseFilter.php
Modified: trunk/extensions/AbuseFilter/AbuseFilter.class.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilter.class.php 2011-11-06 20:59:07 UTC
(rev 102196)
+++ trunk/extensions/AbuseFilter/AbuseFilter.class.php 2011-11-06 21:05:03 UTC
(rev 102197)
@@ -1075,19 +1075,17 @@
AbuseFilter::$tagsToSet[$actionID] =
$parameters;
break;
default:
- if( is_array(
$wgAbuseFilterCustomActionsHandlers ) &&
- in_array( $action, array_keys(
$wgAbuseFilterCustomActionsHandlers ) ) )
- {
+ if( isset(
$wgAbuseFilterCustomActionsHandlers[$action] ) ) {
$custom_function =
$wgAbuseFilterCustomActionsHandlers[$action];
if( is_callable( $custom_function ) ) {
- $ok = call_user_func(
$custom_function, $action, $parameters, $title, $vars, $rule_desc );
+ $msg = call_user_func(
$custom_function, $action, $parameters, $title, $vars, $rule_desc );
}
- if( $ok ) {
- $display .= wfMsgExt(
'abusefilter-' . $action, 'parseinline', array() ) . "<br />\n";
+ if( isset( $msg ) ) {
+ $display .= wfMsgExt( $msg,
'parseinline', array() ) . "<br />\n";
}
- break;
+ } else {
+ wfDebugLog( 'AbuseFilter',
"Unrecognised action $action" );
}
- wfDebugLog( 'AbuseFilter', "Unrecognised action
$action" );
}
return $display;
Modified: trunk/extensions/AbuseFilter/AbuseFilter.php
===================================================================
--- trunk/extensions/AbuseFilter/AbuseFilter.php 2011-11-06 20:59:07 UTC
(rev 102196)
+++ trunk/extensions/AbuseFilter/AbuseFilter.php 2011-11-06 21:05:03 UTC
(rev 102197)
@@ -167,4 +167,5 @@
// Block duration
$wgAbuseFilterBlockDuration = 'indefinite';
-$wgAbuseFilterCustomActionsHandlers = false;
\ No newline at end of file
+// Callback functions for custom actions
+$wgAbuseFilterCustomActionsHandlers = array();
\ No newline at end of file
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
