mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Fix a mailer bug in Rails 3.
This commit is contained in:
parent
f3d654a733
commit
7403c9f80e
2 changed files with 8 additions and 1 deletions
2
Gemfile
2
Gemfile
|
@ -1,7 +1,7 @@
|
|||
source "http://gemcutter.org"
|
||||
|
||||
# Need to install Rails from source
|
||||
gem "rails", "3.0.0.beta2"
|
||||
gem "rails", "3.0.0.beta3"
|
||||
gem "warden", "0.10.3"
|
||||
gem "sqlite3-ruby", :require => "sqlite3"
|
||||
gem "webrat", "0.7"
|
|
@ -37,6 +37,13 @@ class Devise::Mailer < ::ActionMailer::Base
|
|||
mail(headers)
|
||||
end
|
||||
|
||||
# Fix a bug in Rails 3 beta 3
|
||||
def mail(*) #:nodoc:
|
||||
super
|
||||
@_message["template_path"] = nil
|
||||
@_message
|
||||
end
|
||||
|
||||
def mailer_sender(mapping)
|
||||
if Devise.mailer_sender.is_a?(Proc)
|
||||
Devise.mailer_sender.call(mapping.name)
|
Loading…
Reference in a new issue