yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-16 20:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5018 from nurikabe/master

Browse Source 
fix: enfore RFC-822 for email from parameter
This commit is contained in:
Alexandre BODIN 2020-01-21 10:40:05 +01:00 committed by GitHub
commit a260bcfe80
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-admin/controllers/Auth.js
View File

@ -343,7 +343,7 @@ module.exports = {
to: admin.email, to: admin.email,
from: from:
settings.from.email || settings.from.name settings.from.email || settings.from.name
? `"${settings.from.name}" <${settings.from.email}>` ? `${settings.from.name} <${settings.from.email}>`
: undefined, : undefined,
replyTo: settings.response_email, replyTo: settings.response_email,
subject: settings.object, subject: settings.object,

4
packages/strapi-plugin-users-permissions/controllers/Auth.js
View File

@ -362,7 +362,7 @@ module.exports = {
to: user.email, to: user.email,
from: from:
settings.from.email || settings.from.name settings.from.email || settings.from.name
? `"${settings.from.name}" <${settings.from.email}>` ? `${settings.from.name} <${settings.from.email}>`
: undefined, : undefined,
replyTo: settings.response_email, replyTo: settings.response_email,
subject: settings.object, subject: settings.object,
@ -560,7 +560,7 @@ module.exports = {
to: (user.toJSON ? user.toJSON() : user).email, to: (user.toJSON ? user.toJSON() : user).email,
from: from:
settings.from.email && settings.from.name settings.from.email && settings.from.name
? `"${settings.from.name}" <${settings.from.email}>` ? `${settings.from.name} <${settings.from.email}>`
: undefined, : undefined,
replyTo: settings.response_email, replyTo: settings.response_email,
subject: settings.object, subject: settings.object,