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

Use proper nextSequenceValue / insertId system for new filters, instead of adding max(af_id)+1, which doesn't allow concurrent writes.

Browse source
This commit is contained in:
Andrew Garrett 2008-10-21 12:58:01 +00:00
parent 130659bfde
commit a610bea913
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
SpecialAbuseFilter.php
View file

@ -234,10 +234,19 @@ class SpecialAbuseFilter extends SpecialPage {
$dbw->begin();
if ($filter == 'new') {
$new_id = $dbw->selectField( 'abuse_filter', 'max(af_id)', array(), __METHOD__ );
$new_id++;
$new_id = $dbw->nextSequenceValue( 'abuse_filter_af_id_seq' );
$is_new = true;
} else {
$new_id = $this->mFilter;
$is_new = false;
}
$newRow['af_id'] = $new_id;
$dbw->replace( 'abuse_filter', array( 'af_id' ), $newRow, __METHOD__ );
if ($is_new) {
$new_id = $dbw->insertId();
}
// Actions
@ -289,9 +298,9 @@ class SpecialAbuseFilter extends SpecialPage {
// Do the update
$dbw->insert( 'abuse_filter_history', $afh_row, __METHOD__ );
$dbw->replace( 'abuse_filter', array( 'af_id' ), $newRow, __METHOD__ );
$dbw->delete( 'abuse_filter_action', array( 'afa_filter' => $filter, 'afa_consequence' => $deadActions ), __METHOD__ );
$dbw->replace( 'abuse_filter_action', array( array( 'afa_filter', 'afa_consequence' ) ), $actionsRows, __METHOD__ );
$dbw->commit();
global $wgOut;
@ -331,7 +340,7 @@ class SpecialAbuseFilter extends SpecialPage {
$fields = array();
$fields['abusefilter-edit-id'] = $this->mFilter == 'new' ? wfMsg( 'abusefilter-edit-new' ) : $this->mFilter;
$fields['abusefilter-edit-description'] = Xml::input( 'wpFilterDescription', 20, isset( $row->af_public_comments ) ? $row->af_public_comments : '' );
$fields['abusefilter-edit-description'] = Xml::input( 'wpFilterDescription', 45, isset( $row->af_public_comments ) ? $row->af_public_comments : '' );
// Hit count display
if( $this->mFilter !== 'new' ){