jenkins-bot has submitted this change and it was merged. Change subject: Should not send bundle emails if users change mail option ......................................................................
Should not send bundle emails if users change mail option If a user switches to email digest, we should not send or schedule any bundle emails, otherwise, a user may keep getting bundle emails till bundle cycle reset Change-Id: Id8e4f39cad4c61dc9a044558307f0d654193cd49 --- M includes/EmailBundler.php 1 file changed, 7 insertions(+), 0 deletions(-) Approvals: Matthias Mullie: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/EmailBundler.php b/includes/EmailBundler.php index ad03938..7b96cd6 100644 --- a/includes/EmailBundler.php +++ b/includes/EmailBundler.php @@ -211,6 +211,13 @@ * Main function for processinig bundle email */ public function processBundleEmail() { + // User has switched to email digest, should not send any bundle email + // and should not schedule any bundle job, the daily cron will handle + // events left in the queue + if ( intval( $this->mUser->getOption( 'echo-email-frequency' ) ) > 0 ) { + return; + } + $this->retrieveLastEmailTimestamp(); // if there is nothing in the queue, do not schedule a job or -- To view, visit https://gerrit.wikimedia.org/r/58850 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8e4f39cad4c61dc9a044558307f0d654193cd49 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Echo Gerrit-Branch: master Gerrit-Owner: Bsitu <bs...@wikimedia.org> Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org> Gerrit-Reviewer: Lwelling <lwell...@wikimedia.org> Gerrit-Reviewer: Matthias Mullie <mmul...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits