diff options
author | Alex Tsukernik <alxtskrnk@gmail.com> | 2013-07-22 14:23:53 -0400 |
---|---|---|
committer | Alex Tsukernik <alxtskrnk@gmail.com> | 2013-07-22 14:25:20 -0400 |
commit | 49185875a5cd7f7e7a0799e40787cb358d3ba741 (patch) | |
tree | c07ce80c9a5c66d73897442626c9ed0f42ef6843 /actionmailer/lib/action_mailer | |
parent | 1c4eb13345a0c771aab2ee47aecdd4b24acce43a (diff) | |
download | rails-49185875a5cd7f7e7a0799e40787cb358d3ba741.tar.gz rails-49185875a5cd7f7e7a0799e40787cb358d3ba741.tar.bz2 rails-49185875a5cd7f7e7a0799e40787cb358d3ba741.zip |
don't convert mailer default values to procs
Invoke mailer defaults as procs only if they are procs, do not convert
with to_proc. That an object is convertible to a proc does not mean it's
meant to be always used as a proc. Fixes #11533
Diffstat (limited to 'actionmailer/lib/action_mailer')
-rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index fcdd6747b8..cc3a412221 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -685,7 +685,7 @@ module ActionMailer # Call all the procs (if any) class_default = self.class.default default_values = class_default.merge(class_default) do |k,v| - v.respond_to?(:to_proc) ? instance_eval(&v) : v + v.is_a?(Proc) ? instance_eval(&v) : v end # Handle defaults |