Regression: Only add reply-to if sender has emails (#17998)

pull/17994/head^2
Diego Sampaio 6 years ago committed by GitHub
parent c9333af8b5
commit ca4dfa645c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 9
      app/lib/server/functions/notifications/email.js

@ -148,7 +148,6 @@ export function getEmailData({
? receiver.name || receiver.username
: receiver.username;
const [senderEmail] = sender.emails;
const email = {
from: generateNameEmail(username, settings.get('From_Email')),
to: generateNameEmail(receiverName, emailAddress),
@ -157,11 +156,13 @@ export function getEmailData({
data: {
room_path,
},
headers: {
'Reply-To': generateNameEmail(username, senderEmail.address),
},
};
if (sender.emails?.length > 0) {
const [senderEmail] = sender.emails;
email.headers['Reply-To'] = generateNameEmail(username, senderEmail.address);
}
// If direct reply enabled, email content with headers
if (settings.get('Direct_Reply_Enable')) {
const replyto = settings.get('Direct_Reply_ReplyTo') || settings.get('Direct_Reply_Username');

Loading…
Cancel
Save