jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/264232 )

Change subject: Autopromote: Remove superflous condition in APCOND_EDITCOUNT
......................................................................


Autopromote: Remove superflous condition in APCOND_EDITCOUNT

This removes an extra condition in the core APCOND_EDITCOUNT autopromote
criteria. Although it is stated that we can exclude the last X days from
the edit counts, this is not possible for core APCOND_EDITCOUNT as seen
in Autopromote.php. This only works for FlaggedRevs' autopromote
conditions APCOND_FR_CONTENTEDITCOUNT and APCOND_FR_CHECKEDEDITCOUNT.

Change-Id: Ie3d9af5f97d03fb2d3a7d913f3a9210cc7dbd0b4
---
M FlaggedRevs.php
M FlaggedRevs.setup.php
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/FlaggedRevs.php b/FlaggedRevs.php
index d78e9e1..52041a8 100644
--- a/FlaggedRevs.php
+++ b/FlaggedRevs.php
@@ -130,7 +130,7 @@
 $wgFlaggedRevsAutopromote = array(
        'days'                  => 60, # days since registration
        'edits'                 => 250, # total edit count
-       'excludeLastDays'       => 1, # exclude the last X days of edits from 
edit counts
+       'excludeLastDays'       => 1, # exclude the last X days of edits from 
below edit counts
        'benchmarks'            => 15, # number of "spread out" edits
        'spacing'               => 3, # number of days between these edits (the 
"spread")
        // Either totalContentEdits reqs OR totalCheckedEdits requirements 
needed
@@ -151,7 +151,7 @@
 $wgFlaggedRevsAutoconfirm = array(
        'days'                  => 30, # days since registration
        'edits'                 => 50, # total edit count
-       'excludeLastDays'       => 2, # exclude the last X days of edits from 
edit counts
+       'excludeLastDays'       => 2, # exclude the last X days of edits from 
below edit counts
        'benchmarks'            => 7, # number of "spread out" edits
        'spacing'               => 3, # number of days between these edits (the 
"spread")
        // Either totalContentEdits reqs OR totalCheckedEdits requirements 
needed
diff --git a/FlaggedRevs.setup.php b/FlaggedRevs.setup.php
index cefde40..b48ab72 100644
--- a/FlaggedRevs.setup.php
+++ b/FlaggedRevs.setup.php
@@ -60,7 +60,7 @@
                if ( is_array( $req ) ) {
                        $criteria = array( '&', // AND
                                array( APCOND_AGE, $req['days']*86400 ),
-                               array( APCOND_EDITCOUNT, $req['edits'], 
$req['excludeLastDays']*86400 ),
+                               array( APCOND_EDITCOUNT, $req['edits'] ),
                                array( APCOND_FR_EDITSUMMARYCOUNT, 
$req['editComments'] ),
                                array( APCOND_FR_UNIQUEPAGECOUNT, 
$req['uniqueContentPages'] ),
                                array( APCOND_FR_EDITSPACING, $req['spacing'], 
$req['benchmarks'] ),

-- 
To view, visit https://gerrit.wikimedia.org/r/264232
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3d9af5f97d03fb2d3a7d913f3a9210cc7dbd0b4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FlaggedRevs
Gerrit-Branch: master
Gerrit-Owner: Cenarium <cenarium.sy...@gmail.com>
Gerrit-Reviewer: Catrope <r...@wikimedia.org>
Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com>
Gerrit-Reviewer: Luke081515 <luke081...@web.de>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to