aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2012-11-29 09:53:25 -0200
committerSantiago Pastorino <santiago@wyeworks.com>2012-11-29 09:53:25 -0200
commit544b5ee48bdbc5c2f62f4fb720c082a72b39b7a5 (patch)
treec35cd6c85b5b0b8d4f0d15b35e70573664e261c1 /actionmailer
parent5e086cc15ad204e55c2741fd68b95fcacd52ce20 (diff)
downloadrails-544b5ee48bdbc5c2f62f4fb720c082a72b39b7a5.tar.gz
rails-544b5ee48bdbc5c2f62f4fb720c082a72b39b7a5.tar.bz2
rails-544b5ee48bdbc5c2f62f4fb720c082a72b39b7a5.zip
Tiny refactor
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 2b533ad054..c9f10b359b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -508,10 +508,7 @@ module ActionMailer
def process(*args) #:nodoc:
lookup_context.skip_default_locale!
- generated_mail = super
- unless generated_mail
- @_message = NullMail.new
- end
+ @_message = NullMail.new unless super
end
class NullMail #:nodoc: