jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop

This commit is contained in:
daiao 2016-12-23 20:34:54 +08:00
parent 0ce62b9e8c c058a0f21e
commit 7b18f22528
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/models/mailer.rb
View File

@ -34,13 +34,13 @@ class Mailer < ActionMailer::Base
@target = cls @target = cls
end end
def method_missing(name, *args, &block) def method_missing(name, *args, &block)
if Setting.delayjob_enabled? && Object.const_defined?('Delayed') # if Setting.delayjob_enabled? && Object.const_defined?('Delayed')
# with delayed_job # # with delayed_job
@target.delay.send(name, *args, &block) # @target.delay.send(name, *args, &block)
else # else
# without delayed_job # without delayed_job
@target.send(name, *args, &block).deliver @target.send(name, *args, &block).deliver
end # end
end end
end end