mirror of
https://github.com/heartcombo/devise.git
synced 2022-11-09 12:18:31 -05:00
Use instance_eval instead of Proc#bind
Keep the implementation more similar to how it works in Action Mailer, and avoid deprecation warnings with Proc#bind being raised in rails4 branch.
This commit is contained in:
parent
d89dad5728
commit
fa5ae57ce4
1 changed files with 1 additions and 1 deletions
|
@ -56,7 +56,7 @@ module Devise
|
|||
def mailer_sender(mapping, sender = :from)
|
||||
default_sender = default_params[sender]
|
||||
if default_sender.present?
|
||||
default_sender.respond_to?(:call) ? default_sender.bind(self).call : default_sender
|
||||
default_sender.respond_to?(:to_proc) ? instance_eval(&default_sender) : default_sender
|
||||
elsif Devise.mailer_sender.is_a?(Proc)
|
||||
Devise.mailer_sender.call(mapping.name)
|
||||
else
|
||||
|
|
Loading…
Add table
Reference in a new issue