diff options
author | Rafael França <rafaelmfranca@gmail.com> | 2018-09-11 16:30:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-09-11 16:30:22 -0400 |
commit | 7acd2674fb6822cc3841ae2d59b93695ef18b71a (patch) | |
tree | a1038855dee638770fa4d9640acda3268034b474 /actionmailer/lib/action_mailer/base.rb | |
parent | d54d0c95750e2693da495b75ac5fa0280253972d (diff) | |
parent | 576209b45bf6d20e91562da77e454bc58bda3658 (diff) | |
download | rails-7acd2674fb6822cc3841ae2d59b93695ef18b71a.tar.gz rails-7acd2674fb6822cc3841ae2d59b93695ef18b71a.tar.bz2 rails-7acd2674fb6822cc3841ae2d59b93695ef18b71a.zip |
Merge pull request #33824 from yskkin/suppress_logging
Skip delivery notification when perform_deliveries is false.
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 7f22af83b0..55f701b18e 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -588,15 +588,16 @@ module ActionMailer private def set_payload_for_mail(payload, mail) - payload[:mailer] = name - payload[:message_id] = mail.message_id - payload[:subject] = mail.subject - payload[:to] = mail.to - payload[:from] = mail.from - payload[:bcc] = mail.bcc if mail.bcc.present? - payload[:cc] = mail.cc if mail.cc.present? - payload[:date] = mail.date - payload[:mail] = mail.encoded + payload[:mailer] = name + payload[:message_id] = mail.message_id + payload[:subject] = mail.subject + payload[:to] = mail.to + payload[:from] = mail.from + payload[:bcc] = mail.bcc if mail.bcc.present? + payload[:cc] = mail.cc if mail.cc.present? + payload[:date] = mail.date + payload[:mail] = mail.encoded + payload[:perform_deliveries] = mail.perform_deliveries end def method_missing(method_name, *args) |