Permalink
Browse files

Remove extra variable creation and merge.

  • Loading branch information...
vipulnsward committed Oct 20, 2013
1 parent cc8d148 commit f72437bf3f24fa6ed9543b3b77d47a3f0fd593a0
Showing with 3 additions and 3 deletions.
  1. +3 −3 actionmailer/lib/action_mailer/base.rb
@@ -685,9 +685,9 @@ def mail(headers = {}, &block)
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

0 comments on commit f72437b

Please sign in to comment.