mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-26 08:36:12 +01:00
fix: #13198, use email from confirmObj
if includeUnverifiedEmails setting is turned on. userData.email is set to the unconfirmed email
This commit is contained in:
@@ -223,6 +223,13 @@ Emailer.send = async (template, uid, params) => {
|
||||
// 'welcome' and 'verify-email' explicitly used passed-in email address
|
||||
if (['welcome', 'verify-email'].includes(template)) {
|
||||
userData.email = params.email;
|
||||
} else if (meta.config.includeUnverifiedEmails && !userData.email) {
|
||||
// get unconfirmed email to use
|
||||
const code = await db.get(`confirm:byUid:${uid}`);
|
||||
const confirmObj = code ? await db.getObject(`confirm:${code}`) : null;
|
||||
if (confirmObj && confirmObj.email) {
|
||||
userData.email = String(confirmObj.email);
|
||||
}
|
||||
}
|
||||
|
||||
({ template, userData, params } = await Plugins.hooks.fire('filter:email.prepare', { template, uid, userData, params }));
|
||||
|
||||
Reference in New Issue
Block a user