jenkins-bot has submitted this change and it was merged.
Change subject: Fix auto-archive switch variable name
......................................................................
Fix auto-archive switch variable name
AFTv5 code assumes ArticleFeedbackv5 prefix, v5 was accidentally omitted
Meanwhile also removed dewiki config - in retrospect, they didn't want it
Change-Id: I1e9ae98c78d91396b38d17a72b64d8a1fe35853c
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 4 insertions(+), 11 deletions(-)
Approvals:
Bsitu: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 695e438..6584d8d 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1763,8 +1763,8 @@
$wgArticleFeedbackv5Namespaces = $wmgArticleFeedbackv5Namespaces;
$wgArticleFeedbackv5LotteryOdds = $wmgArticleFeedbackv5LotteryOdds;
$wgArticleFeedbackv5EnableProtection =
$wmgArticleFeedbackv5EnableProtection;
- $wgArticleFeedbackAutoArchiveEnabled =
$wmgArticleFeedbackAutoArchiveEnabled;
- $wgArticleFeedbackAutoArchiveTtl = $wmgArticleFeedbackAutoArchiveTtl;
+ $wgArticleFeedbackv5AutoArchiveEnabled =
$wmgArticleFeedbackv5AutoArchiveEnabled;
+ $wgArticleFeedbackv5AutoArchiveTtl =
$wmgArticleFeedbackv5AutoArchiveTtl;
$wgArticleFeedbackv5Watchlist = $wmgArticleFeedbackv5Watchlist;
$wgArticleFeedbackv5ArticlePageLink =
$wmgArticleFeedbackv5ArticlePageLink;
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 1439f15..e9517ab 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10789,7 +10789,7 @@
* This should be manually set to true, to make sure the filter
* does not show up when the cronjob is not running.
*/
-'wmgArticleFeedbackAutoArchiveEnabled' => array(
+'wmgArticleFeedbackv5AutoArchiveEnabled' => array(
'default' => false,
'enwiki' => true,
),
@@ -10799,20 +10799,13 @@
* faster. For a fixed date, a simple integer can be passed instead of an
* array, to make it "amount of unreviewed feedback"-agnostic.
*/
-'wmgArticleFeedbackAutoArchiveTtl' => array(
+'wmgArticleFeedbackv5AutoArchiveTtl' => array(
'default' => array(
0 => '+2 years', // < 9 unreviewed feedback
10 => '+1 month', // 10-19
20 => '+1 week', // 20-29
30 => '+3 days', // 30-39
40 => '+2 days', // > 40
- ),
- 'dewiki' => array(
- 0 => '+1 year', // < 9 unreviewed feedback
- 10 => '+6 months', // 10-19
- 20 => '+3 months', // 20-29
- 30 => '+2 months', // 30-39
- 40 => '+1 month', // > 40
),
),
/*
--
To view, visit https://gerrit.wikimedia.org/r/72756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e9ae98c78d91396b38d17a72b64d8a1fe35853c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
