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

Merge "Minor removal of duplicate code within the AF parser"

Browse source
This commit is contained in:
MaxSem 2012-12-27 18:24:38 +00:00 committed by Gerrit Code Review
parent afc1a2eb7a fc5ef1666b
commit e788899514
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
AbuseFilter.parser.php
View file

@ -1014,24 +1014,14 @@ class AbuseFilterParser {
$this->move();
$r2 = new AFPData();
if ( $op == '&' && !( $result->toBool() ) ) {
// We can go on quickly as either one statement with | is true or on with & is false
if ( ( $op == '&' && !$result->toBool() ) || ( $op == '|' && $result->toBool() ) ) {
wfProfileIn( __METHOD__ . '-shortcircuit' );
$orig = $this->mShortCircuit;
$this->mShortCircuit = $this->mAllowShort;
$this->doLevelCompares( $r2 );
$this->mShortCircuit = $orig;
$result = new AFPData( AFPData::DBool, false );
wfProfileOut( __METHOD__ . '-shortcircuit' );
continue;
}
if ( $op == '|' && $result->toBool() ) {
wfProfileIn( __METHOD__ . '-shortcircuit' );
$orig = $this->mShortCircuit;
$this->mShortCircuit = $this->mAllowShort;
$this->doLevelCompares( $r2 );
$this->mShortCircuit = $orig;
$result = new AFPData( AFPData::DBool, true );
$result = new AFPData( AFPData::DBool, $result->toBool() );
wfProfileOut( __METHOD__ . '-shortcircuit' );
continue;
}