diff --git a/src/controllers/accounts.js b/src/controllers/accounts.js index 2225373ee2..0c906e562c 100644 --- a/src/controllers/accounts.js +++ b/src/controllers/accounts.js @@ -365,6 +365,8 @@ accountsController.accountSettings = function(req, res, next) { userData.settings = results.settings; userData.languages = results.languages; + userData.disableEmailSubscriptions = meta.config.disableEmailSubscriptions !== undefined && parseInt(meta.config.disableEmailSubscriptions, 10) === 1; + res.render('account/settings', userData); }); }); diff --git a/src/user/jobs.js b/src/user/jobs.js index 7659a87aea..160f3bb33c 100644 --- a/src/user/jobs.js +++ b/src/user/jobs.js @@ -22,6 +22,11 @@ module.exports = function(User) { }; User.sendDailyDigests = function() { + var digestsDisabled = meta.config.disableEmailSubscriptions !== undefined && parseInt(meta.config.disableEmailSubscriptions, 10) === 1; + if (digestsDisabled) { + return winston.log('[user/jobs] Did not send daily digests because subscription system is disabled.'); + } + async.parallel({ recent: function(next) { topics.getLatestTopics(0, 0, 10, 'day', next);