kotovalexarian-likes-github
/
heartcombo--devise
mirror of https://github.com/heartcombo/devise.git
1
0
Fork 0
Code Releases Activity

Fix a mailer bug in Rails 3.

This commit is contained in:
José Valim 2010-04-13 23:11:12 +02:00
parent f3d654a733
commit 7403c9f80e
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -1,7 +1,7 @@
source "http://gemcutter.org" source "http://gemcutter.org"
# Need to install Rails from source # Need to install Rails from source
gem "rails", "3.0.0.beta2" gem "rails", "3.0.0.beta3"
gem "warden", "0.10.3" gem "warden", "0.10.3"
gem "sqlite3-ruby", :require => "sqlite3" gem "sqlite3-ruby", :require => "sqlite3"
gem "webrat", "0.7" gem "webrat", "0.7"

7
app/models/devise/mailer.rb
View File

@ -37,6 +37,13 @@ class Devise::Mailer < ::ActionMailer::Base
mail(headers) mail(headers)
end end
# Fix a bug in Rails 3 beta 3
def mail(*) #:nodoc:
super
@_message["template_path"] = nil
@_message
end
def mailer_sender(mapping) def mailer_sender(mapping)
if Devise.mailer_sender.is_a?(Proc) if Devise.mailer_sender.is_a?(Proc)
Devise.mailer_sender.call(mapping.name) Devise.mailer_sender.call(mapping.name)