r51415 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r51414‎ | r51415 | r51416 >
Date:16:05, 3 June 2009
Author:werdna
Status:ok
Tags:
Comment:
(bug 18908) Do not add tags from disabled filters to valid_tags.
Modified paths:
  • /trunk/extensions/AbuseFilter/AbuseFilter.hooks.php (modified) (history)

Diff [purge]

Index: trunk/extensions/AbuseFilter/AbuseFilter.hooks.php
@@ -138,8 +138,9 @@
139139 ## This is a pretty awful hack.
140140 $dbr = wfGetDB( DB_SLAVE );
141141
142 - $res = $dbr->select( 'abuse_filter_action', 'afa_parameters',
143 - array( 'afa_consequence' => 'tag' ), __METHOD__ );
 142+ $res = $dbr->select( array( 'abuse_filter_action', 'abuse_filter' ), 'afa_parameters',
 143+ array( 'afa_consequence' => 'tag', 'af_enabled' => true ), __METHOD__, array(),
 144+ array( 'abuse_filter' => array( 'inner join', 'afa_filter=af_id' ) ) );
144145
145146 while( $row = $res->fetchObject() ) {
146147 $emptyTags = array_filter(

Status & tagging log