TTO has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/341943 )
Change subject: ContributionsQuery: Disregard bots whose group membership has
expired
......................................................................
ContributionsQuery: Disregard bots whose group membership has expired
Bug: T157017
Change-Id: I300b6ffbf99cde0b64d1a81937f27576560ee8a9
---
M includes/Formatter/ContributionsQuery.php
1 file changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/43/341943/2
diff --git a/includes/Formatter/ContributionsQuery.php
b/includes/Formatter/ContributionsQuery.php
index 789110f..5160c24 100644
--- a/includes/Formatter/ContributionsQuery.php
+++ b/includes/Formatter/ContributionsQuery.php
@@ -318,16 +318,18 @@
}
$minUserId = (int) ( $max - $max / 100 );
- // exclude all users withing groups with bot permission
+ // exclude all users within groups with bot permission
$excludeUserIds = array();
$groupsWithBotPermission = User::getGroupsWithPermission( 'bot'
);
if ( count( $groupsWithBotPermission ) ) {
- $rows = $pager->getDatabase()->select(
+ $db = $pager->getDatabase();
+ $rows = $db->select(
array( 'user', 'user_groups' ),
'user_id',
array(
'user_id > ' . $minUserId,
- 'ug_group' => $groupsWithBotPermission
+ 'ug_group' => $groupsWithBotPermission,
+ 'ug_expiry IS NULL OR ug_expiry >= ' .
$db->addQuotes( $db->timestamp() )
),
__METHOD__,
array(),
--
To view, visit https://gerrit.wikimedia.org/r/341943
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I300b6ffbf99cde0b64d1a81937f27576560ee8a9
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: TTO <at.li...@live.com.au>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
