yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 12:18:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5584 from joshwnj/fix-default-from-address

Browse Source 
Fix the order of settings in ses provider
This commit is contained in:
Alexandre BODIN 2020-03-24 11:21:46 +01:00 committed by GitHub
commit 562b030025
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/strapi-provider-email-amazon-ses/lib/index.js
View File

@ -48,8 +48,8 @@ module.exports = {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
// Default values. // Default values.
options = _.isObject(options) ? options : {}; options = _.isObject(options) ? options : {};
options.from = options.from || config.amazon_ses_default_from; options.from = config.amazon_ses_default_from || options.from;
options.replyTo = options.replyTo || config.amazon_ses_default_replyto; options.replyTo = config.amazon_ses_default_replyto || options.replyTo;
options.text = options.text || options.html; options.text = options.text || options.html;
options.html = options.html || options.text; options.html = options.html || options.text;