diff options
| author | José Valim <jose.valim@plataformatec.com.br> | 2013-07-24 10:13:50 -0700 |
|---|---|---|
| committer | José Valim <jose.valim@plataformatec.com.br> | 2013-07-24 10:13:50 -0700 |
| commit | fa265346a95b2264f163f170e8322afb223063c7 (patch) | |
| tree | 126e1a8d767cdc1bb5e95ec9a42f8f08d1e538ff /actionmailer/lib | |
| parent | 758b2c37776cb0871c65c44061e96076dc5f4dfa (diff) | |
| parent | 49185875a5cd7f7e7a0799e40787cb358d3ba741 (diff) | |
| download | rails-fa265346a95b2264f163f170e8322afb223063c7.tar.gz rails-fa265346a95b2264f163f170e8322afb223063c7.tar.bz2 rails-fa265346a95b2264f163f170e8322afb223063c7.zip | |
Merge pull request #11559 from bughit/11533_to_proc
don't convert mailer default values to procs
Diffstat (limited to 'actionmailer/lib')
| -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 |