diff options
| author | Yves Senn <yves.senn@gmail.com> | 2013-10-20 23:58:53 -0700 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2013-10-20 23:58:53 -0700 |
| commit | 6205476a53865cec15895dc0546a5ececace5b7a (patch) | |
| tree | c1bff2c88a8fc1a38934543929a3b4336dbf562a /actionmailer/lib | |
| parent | fdfc96750a396d385d05ea1bf2de58c4d777e72e (diff) | |
| parent | f72437bf3f24fa6ed9543b3b77d47a3f0fd593a0 (diff) | |
| download | rails-6205476a53865cec15895dc0546a5ececace5b7a.tar.gz rails-6205476a53865cec15895dc0546a5ececace5b7a.tar.bz2 rails-6205476a53865cec15895dc0546a5ececace5b7a.zip | |
Merge pull request #12591 from vipulnsward/remove_mail_merge
Remove extra variable creation and merge.
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 6357805198..becd4126f4 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -692,9 +692,9 @@ module ActionMailer content_type = headers[:content_type] # Call all the procs (if any) - class_default = self.class.default - default_values = class_default.merge(class_default) do |k,v| - v.is_a?(Proc) ? instance_eval(&v) : v + default_values = {} + self.class.default.each do |k,v| + default_values[k] = v.is_a?(Proc) ? instance_eval(&v) : v end # Handle defaults |