jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365043 )
Change subject: Fix the order of conditions when choosing the correct method
......................................................................
Fix the order of conditions when choosing the correct method
It seems that move actions have rc_this_oldid set. rc_log_type
should have higher priority.
Bug: T170586
Change-Id: I9bb4ea599f12ef01fad823ac3232330966b0d281
---
M includes/AbuseFilter.class.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
Huji: Looks good to me, but someone else must approve
NoRandom: Looks good to me, but someone else must approve
Framawiki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/AbuseFilter.class.php b/includes/AbuseFilter.class.php
index 224a982..779a6d2 100644
--- a/includes/AbuseFilter.class.php
+++ b/includes/AbuseFilter.class.php
@@ -2076,13 +2076,13 @@
* @return AbuseFilterVariableHolder|null
*/
public static function getVarsFromRCRow( $row ) {
- if ( $row->rc_this_oldid ) {
- // It's an edit.
- $vars = self::getEditVarsFromRCRow( $row );
- } elseif ( $row->rc_log_type == 'move' ) {
+ if ( $row->rc_log_type == 'move' ) {
$vars = self::getMoveVarsFromRCRow( $row );
} elseif ( $row->rc_log_type == 'newusers' ) {
$vars = self::getCreateVarsFromRCRow( $row );
+ } elseif ( $row->rc_this_oldid ) {
+ // It's an edit.
+ $vars = self::getEditVarsFromRCRow( $row );
} else {
return null;
}
--
To view, visit https://gerrit.wikimedia.org/r/365043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9bb4ea599f12ef01fad823ac3232330966b0d281
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek <[email protected]>
Gerrit-Reviewer: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Framawiki <[email protected]>
Gerrit-Reviewer: Huji <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: NoRandom <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
