diff options
author | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2018-12-12 15:49:35 -0500 |
---|---|---|
committer | Gannon McGibbon <gannon.mcgibbon@gmail.com> | 2019-01-07 17:38:28 -0500 |
commit | 5d6578d15bb5d3bfe3751a6493b9e3fe99618408 (patch) | |
tree | 59ee4e82758dee925637499a4ec151e2971ba13e /actionmailer/lib/action_mailer/parameterized.rb | |
parent | e5f2d2906a395dcac0afd1abc268ca7f061765b8 (diff) | |
download | rails-5d6578d15bb5d3bfe3751a6493b9e3fe99618408.tar.gz rails-5d6578d15bb5d3bfe3751a6493b9e3fe99618408.tar.bz2 rails-5d6578d15bb5d3bfe3751a6493b9e3fe99618408.zip |
Fix legacy fallback for parameterized mailers
Diffstat (limited to 'actionmailer/lib/action_mailer/parameterized.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/parameterized.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/parameterized.rb b/actionmailer/lib/action_mailer/parameterized.rb index 999435919e..0a97af8105 100644 --- a/actionmailer/lib/action_mailer/parameterized.rb +++ b/actionmailer/lib/action_mailer/parameterized.rb @@ -145,12 +145,20 @@ module ActionMailer if processed? super else - job = @mailer_class.delivery_job + job = delivery_job_class args = arguments_for(job, delivery_method) job.set(options).perform_later(*args) end end + def delivery_job_class + if @mailer_class.delivery_job <= MailDeliveryJob + @mailer_class.delivery_job + else + Parameterized::DeliveryJob + end + end + def arguments_for(delivery_job, delivery_method) if delivery_job <= MailDeliveryJob [@mailer_class.name, @action.to_s, delivery_method.to_s, params: @params, args: @args] |