diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2018-11-23 17:00:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-23 17:00:45 -0500 |
| commit | 34726ad8959079fea17a2f6ea7fc2bd4864255a6 (patch) | |
| tree | 59438a03e8096c5232ff1d43a55c08cc4a307f84 /actionmailer/lib/action_mailer/delivery_job.rb | |
| parent | 437d20916f80eb905a1c028db4bd53304c293e61 (diff) | |
| parent | 60339da5bcb76489576321fa12e665f176d8d692 (diff) | |
| download | rails-34726ad8959079fea17a2f6ea7fc2bd4864255a6.tar.gz rails-34726ad8959079fea17a2f6ea7fc2bd4864255a6.tar.bz2 rails-34726ad8959079fea17a2f6ea7fc2bd4864255a6.zip | |
Merge pull request #34367 from gmcgibbon/rm_parameterized_delivery_job
Deliver parameterized mail with DeliveryJob
Diffstat (limited to 'actionmailer/lib/action_mailer/delivery_job.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/delivery_job.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/delivery_job.rb b/actionmailer/lib/action_mailer/delivery_job.rb index 40f26d8ad1..8af2097819 100644 --- a/actionmailer/lib/action_mailer/delivery_job.rb +++ b/actionmailer/lib/action_mailer/delivery_job.rb @@ -12,8 +12,9 @@ module ActionMailer rescue_from StandardError, with: :handle_exception_with_mailer_class - def perform(mailer, mail_method, delivery_method, *args) #:nodoc: - mailer.constantize.public_send(mail_method, *args).send(delivery_method) + def perform(mailer, mail_method, delivery_method, params, *args) #:nodoc: + mailer_class = params ? mailer.constantize.with(params) : mailer.constantize + mailer_class.public_send(mail_method, *args).send(delivery_method) end private |