diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-24 09:59:59 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2012-01-24 09:59:59 -0800 |
| commit | 82e2f19aac68e1ee05484a2247d2d7771fe3f66f (patch) | |
| tree | 91ba019921d47f5e0566727b599cd4dafcc20eef | |
| parent | 29aa20daa6d6b8f9912dadbc13867341cddeb601 (diff) | |
| parent | 3fbc042b580f518d060671d0dd86ec2a4d14a42b (diff) | |
| download | rails-82e2f19aac68e1ee05484a2247d2d7771fe3f66f.tar.gz rails-82e2f19aac68e1ee05484a2247d2d7771fe3f66f.tar.bz2 rails-82e2f19aac68e1ee05484a2247d2d7771fe3f66f.zip | |
Merge pull request #4630 from lest/patch-2
Use instance_eval instead of Proc#bind
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 457ee24a0f..1800ff5839 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -1,7 +1,6 @@ require 'mail' require 'action_mailer/collector' require 'active_support/core_ext/object/blank' -require 'active_support/core_ext/proc' require 'active_support/core_ext/string/inflections' require 'active_support/core_ext/hash/except' require 'action_mailer/log_subscriber' @@ -611,7 +610,7 @@ module ActionMailer #:nodoc: # Call all the procs (if any) class_default = self.class.default default_values = class_default.merge(class_default) do |k,v| - v.respond_to?(:call) ? v.bind(self).call : v + v.respond_to?(:to_proc) ? instance_eval(&v) : v end # Handle defaults |