aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib/action_mailer/base.rb
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2014-08-12 18:24:19 +0000
committerAbdelkader Boudih <terminale@gmail.com>2014-08-13 11:36:32 +0000
commit67f8b6b2bc7e7eca8723996b1303c3fafa5ed39b (patch)
tree17d779714eb326cf6cfd679a64601a7072911ed0 /actionmailer/lib/action_mailer/base.rb
parent22ee993825897fe2adafebeed57158f0699b071b (diff)
downloadrails-67f8b6b2bc7e7eca8723996b1303c3fafa5ed39b.tar.gz
rails-67f8b6b2bc7e7eca8723996b1303c3fafa5ed39b.tar.bz2
rails-67f8b6b2bc7e7eca8723996b1303c3fafa5ed39b.zip
Added ActionMailer::DeliverLater
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
-rw-r--r--actionmailer/lib/action_mailer/base.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index bc540aece0..df0c945434 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -549,7 +549,11 @@ module ActionMailer
def method_missing(method_name, *args) # :nodoc:
if respond_to?(method_name)
- new(method_name, *args).message
+ if defined?(::ActiveJob) && action_methods.include?(method_name.to_s)
+ DeliverLater::MailMessageWrapper.new(self, method_name, *args)
+ else
+ new(method_name, *args).message
+ end
else
super
end