diff options
| author | Vipul A M <vipulnsward@gmail.com> | 2013-10-20 10:31:41 +0530 |
|---|---|---|
| committer | Vipul A M <vipulnsward@gmail.com> | 2013-10-20 10:31:41 +0530 |
| commit | f72437bf3f24fa6ed9543b3b77d47a3f0fd593a0 (patch) | |
| tree | dd57e546930d511d368ea99030b5c9465aeecd2c /actionmailer | |
| parent | cc8d14827d117ed7da7a17c4a057a8e5f71625ca (diff) | |
| download | rails-f72437bf3f24fa6ed9543b3b77d47a3f0fd593a0.tar.gz rails-f72437bf3f24fa6ed9543b3b77d47a3f0fd593a0.tar.bz2 rails-f72437bf3f24fa6ed9543b3b77d47a3f0fd593a0.zip | |
Remove extra variable creation and merge.
Diffstat (limited to 'actionmailer')
| -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 ada86fbc4f..f3d778f0bd 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -685,9 +685,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 |