Node.js based forum software built for the modern web
refactor: use email used during registration
Barış Soner Uşaklı3882642d6dd4
diff --git a/src/emailer.js b/src/emailer.jsindex c8509bf57f..ffd6968eaa 100644--- a/src/emailer.js+++ b/src/emailer.js@@ -228,8 +228,8 @@ Emailer.send = async (template, uid, params) => {let userData = await User.getUserFields(uid, ['email', 'username', 'email:confirmed', 'banned']);- // 'welcome' and 'verify-email' explicitly used passed-in email address- if (['welcome', 'verify-email'].includes(template)) {+ // 'welcome', 'verify-email' & 'registration_accepted' explicitly use passed-in email address+ if (['welcome', 'verify-email', 'registration_accepted'].includes(template)) {userData.email = params.email;} else if (meta.config.includeUnverifiedEmails && !userData.email) {// get unconfirmed email to usediff --git a/src/user/approval.js b/src/user/approval.jsindex d1104656a2..06d5fe7581 100644--- a/src/user/approval.js+++ b/src/user/approval.js@@ -96,6 +96,7 @@ module.exports = function (User) {await plugins.hooks.fire('filter:register.complete', { uid: uid });await emailer.send('registration_accepted', uid, {username: username,+ email: userData.email,subject: `[[email:welcome-to, ${meta.config.title || meta.config.browserTitle || 'NodeBB'}]]`,template: 'registration_accepted',uid: uid,