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

Fix faulty query in normalizeThrottleParameters

Browse source 
The DESC must be specified in the ORDER BY clause, or it will return the
first row instead of the last. Plus select only needed fields and remove
deprecated Database::nextSequenceValue.

Bug: T209565
Change-Id: I48f83f64d406c553a55ac4bbee700d59002e6a18
This commit is contained in:
Daimona Eaytoy 2019-03-01 19:22:27 +01:00
parent 99c2749511
commit 1244960435
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
maintenance/normalizeThrottleParameters.php
View file

@ -331,10 +331,18 @@ class NormalizeThrottleParameters extends LoggedUpdateMaintenance {
foreach ( $touchedIDs as $filter ) {
$histRow = $this->dbw->selectRow(
'abuse_filter_history',
'*',
[
'afh_filter',
'afh_pattern',
'afh_comments',
'afh_flags',
'afh_public_comments',
'afh_deleted',
'afh_group'
],
[ 'afh_filter' => $filter ],
__METHOD__,
[ 'ORDER BY' => 'afh_id', 'LOCK IN SHARE MODE' ]
[ 'ORDER BY' => 'afh_id DESC', 'LOCK IN SHARE MODE' ]
);
if ( !isset( $historyThrottleParams[ $filter ] ) ) {
@ -357,7 +365,6 @@ class NormalizeThrottleParameters extends LoggedUpdateMaintenance {
}
$newHistoryRows[] = [
'afh_id' => $this->dbw->nextSequenceValue( 'abuse_filter_afh_id_seq' ),
'afh_user' => $user->getId(),
'afh_user_text' => $user->getName(),
'afh_timestamp' => $timestamp,
@ -369,7 +376,7 @@ class NormalizeThrottleParameters extends LoggedUpdateMaintenance {
$historyCount = count( $changeHistoryFilters );
if ( $historyCount !== $affectedActionRows ) {
// Sanity: prevent unexpexted errors.
// Sanity: prevent unexpected errors.
$this->fail(
"The amount of affected rows isn't equal for abuse_filter_action and abuse_filter history. " .
"Found $affectedActionRows for the former and $historyCount for the latter."