TTO has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/335644 )
Change subject: Disregard expired user groups when populating the voter list
......................................................................
Disregard expired user groups when populating the voter list
I didn't touch cli/wm-scripts/bv2013/doSpam.php, as it is an old archived
script.
Bug: T157018
Change-Id: I67632761d0bbb2bf7f7f170ae7cff019f10e668e
---
M includes/jobs/PopulateVoterListJob.php
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SecurePoll
refs/changes/44/335644/1
diff --git a/includes/jobs/PopulateVoterListJob.php
b/includes/jobs/PopulateVoterListJob.php
index 03d380e..d3fe3c8 100644
--- a/includes/jobs/PopulateVoterListJob.php
+++ b/includes/jobs/PopulateVoterListJob.php
@@ -265,6 +265,7 @@
}
// Criterion 3: Not in a listed group
+ global $wgDisableUserGroupExpiry;
if ( $this->params['list_exclude-groups'] ) {
$res = $dbr->select(
array( 'user', 'user_groups' ),
@@ -280,6 +281,9 @@
'user_groups' => array( 'LEFT
OUTER JOIN', array(
'ug_user =
user_id',
'ug_group' =>
$this->params['list_exclude-groups'],
+ ( !isset(
$wgDisableUserGroupExpiry ) || $wgDisableUserGroupExpiry ) ?
+ '1' :
+
'ug_expiry IS NULL OR ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() ),
)
),
)
@@ -304,7 +308,10 @@
array(
"ug_user >= $min",
"ug_user < $max",
- 'ug_group' =>
$this->params['list_include-groups']
+ 'ug_group' =>
$this->params['list_include-groups'],
+ ( !isset(
$wgDisableUserGroupExpiry ) || $wgDisableUserGroupExpiry ) ?
+ '1' :
+ 'ug_expiry IS NULL OR
ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() ),
)
);
$list = array();
--
To view, visit https://gerrit.wikimedia.org/r/335644
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67632761d0bbb2bf7f7f170ae7cff019f10e668e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SecurePoll
Gerrit-Branch: master
Gerrit-Owner: TTO <at.li...@live.com.au>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
