From 3fc609ee4122560357274f70f016e41e1a059968 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Mon, 12 Apr 2010 10:50:27 +0200
Subject: Fix ActionMailer test broken in
 99d54599215c2a8cea7e57f609e8e578043d71b2

---
 actionmailer/lib/action_mailer/base.rb | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'actionmailer')

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.
     # 
-- 
cgit v1.2.3