diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-28 12:55:53 -0700 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2012-10-28 17:58:48 -0200 |
commit | 37586ddf279c46c3d0c8c2553d0918aa82ceb020 (patch) | |
tree | 007e6b8a334dfe24703491e8df635b5bd8114b23 /actionmailer/lib/action_mailer/base.rb | |
parent | 2b5d3aa442625169125ff0be95fe30f7d462ea54 (diff) | |
download | rails-37586ddf279c46c3d0c8c2553d0918aa82ceb020.tar.gz rails-37586ddf279c46c3d0c8c2553d0918aa82ceb020.tar.bz2 rails-37586ddf279c46c3d0c8c2553d0918aa82ceb020.zip |
Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call
Do not render views when mail() isn't called. (NullMail refactoring)
Conflicts:
actionmailer/CHANGELOG.md
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 2a11cb6ca7..a9fb49a303 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -454,7 +454,19 @@ module ActionMailer #:nodoc: def process(*args) #:nodoc: lookup_context.skip_default_locale! - super + + generated_mail = super + unless generated_mail + @_message = NullMail.new + end + end + + class NullMail #:nodoc: + def body; '' end + + def method_missing(*args) + nil + end end def mailer_name |