mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-04 21:15:55 +01:00
Merge branch 'master' of https://github.com/NodeBB/NodeBB
This commit is contained in:
@@ -210,6 +210,12 @@ Emailer.sendToEmail = function (template, email, language, params, callback) {
|
||||
|
||||
var lang = language || meta.config.defaultLang || 'en-GB';
|
||||
|
||||
// Add some default email headers based on local configuration
|
||||
params.headers = Object.assign({
|
||||
'List-Id': '<' + [template, params.uid, getHostname()].join('.') + '>',
|
||||
'List-Unsubscribe': '<' + [nconf.get('url'), 'uid', params.uid, 'settings'].join('/') + '>',
|
||||
}, params.headers);
|
||||
|
||||
async.waterfall([
|
||||
function (next) {
|
||||
Plugins.fireHook('filter:email.params', {
|
||||
@@ -249,6 +255,7 @@ Emailer.sendToEmail = function (template, email, language, params, callback) {
|
||||
uid: params.uid,
|
||||
pid: params.pid,
|
||||
fromUid: params.fromUid,
|
||||
headers: params.headers,
|
||||
};
|
||||
Plugins.fireHook('filter:email.modify', data, next);
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user