wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-24 10:48:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Removing AbuseFilter::checkConditions' param"

Browse source
This commit is contained in:
jenkins-bot 2014-01-07 19:28:46 +00:00 committed by Gerrit Code Review
parent caa38381c8 84536df324
commit 2125c3e341
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
AbuseFilter.class.php
View file

@ -373,22 +373,22 @@ class AbuseFilter {
* @param $conds
* @param $vars
* @param $ignoreError bool
* @param $keepVars string
* @return bool
* @throws Exception
*/
public static function checkConditions(
$conds, $vars, $ignoreError = true, $keepVars = 'resetvars'
$conds, $vars, $ignoreError = true
) {
global $wgAbuseFilterParserClass;
static $parser;
static $parser, $lastVars;
wfProfileIn( __METHOD__ );
if ( is_null( $parser ) || $keepVars == 'resetvars' ) {
if ( is_null( $parser ) || $vars !== $lastVars ) {
/** @var $parser AbuseFilterParser */
$parser = new $wgAbuseFilterParserClass( $vars );
$lastVars = $vars;
}
try {
@ -507,8 +507,7 @@ class AbuseFilter {
if ( self::checkConditions(
$pattern,
$vars,
true /* ignore errors */,
'keepvars'
true /* ignore errors */
) ) {
// Record match.
$result = true;