aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-04-12 10:50:27 +0200
committerJosé Valim <jose.valim@gmail.com>2010-04-12 10:50:27 +0200
commit3fc609ee4122560357274f70f016e41e1a059968 (patch)
tree54b7896162da1ac0bb1cb2590ca9eeea96cdd543 /actionmailer
parentb5f9a9fce316e96ffb9ab3a69e9311f8b1e56fde (diff)
downloadrails-3fc609ee4122560357274f70f016e41e1a059968.tar.gz
rails-3fc609ee4122560357274f70f016e41e1a059968.tar.bz2
rails-3fc609ee4122560357274f70f016e41e1a059968.zip
Fix ActionMailer test broken in 99d54599215c2a8cea7e57f609e8e578043d71b2
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 5045a9c0ca..9c0f5d0ac3 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -375,6 +375,11 @@ module ActionMailer #:nodoc:
process(method_name, *args) if method_name
end
+ def process(*args) #:nodoc:
+ lookup_context.skip_default_locale!
+ super
+ end
+
# Allows you to pass random and unusual headers to the new +Mail::Message+ object
# which will add them to itself.
#