wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-24 06:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes I7d8ddaa6,If708a112

Browse source 
* changes:
  Update comments and satisfy analyzer
  Remove unused local variables
This commit is contained in:
jenkins-bot 2013-10-15 11:53:31 +00:00 committed by Gerrit Code Review
parent ba19aac2d0 153c285758
commit 19b7ea8c66
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AbuseFilter.class.php
View file

@ -974,7 +974,7 @@ class AbuseFilter {
$local_log_ids = array();
global $wgAbuseFilterNotifications, $wgAbuseFilterNotificationsPrivate;
foreach ( $log_rows as $index => $data ) {
foreach ( $log_rows as $data ) {
$data['afl_var_dump'] = $var_dump;
$data['afl_id'] = $dbw->nextSequenceValue( 'abuse_filter_log_afl_id_seq' );
$dbw->insert( 'abuse_filter_log', $data, __METHOD__ );

2
AbuseFilter.hooks.php
View file

@ -29,7 +29,7 @@ class AbuseFilterHooks {
// poor man's PST, see bug 20310
$text = str_replace( "\r\n", "\n", $text );
$continue = self::filterEdit( $context, null, $text, $status, $summary, $minoredit );
self::filterEdit( $context, null, $text, $status, $summary, $minoredit );
if ( !$status->isOK() ) {
$msg = $status->getErrorsArray();

6
AbuseFilter.parser.php
View file

@ -707,8 +707,7 @@ class AbuseFilterParser {
*/
protected function move( ) {
wfProfileIn( __METHOD__ );
list( $val, $type, $code, $offset ) =
self::nextToken( $this->mCode, $this->mPos );
list( $val, $type, , $offset ) = self::nextToken( $this->mCode, $this->mPos );
$token = new AFPToken( $type, $val, $this->mPos );
$this->mPos = $offset;
@ -1931,6 +1930,9 @@ class AbuseFilterParser {
if ( is_null( $replacementArray ) ) {
global $IP;
if ( is_readable( "$IP/extensions/AntiSpoof/equivset.php" ) ) {
// Satisfy analyzer.
$equivset = null;
// Contains a map of characters in $equivset.
require "$IP/extensions/AntiSpoof/equivset.php";
$replacementArray = new ReplacementArray( $equivset );
} else {