Permalink
Browse files

some modifications in action_mailer/base.rb

  • Loading branch information...
1 parent 787cac1 commit c1763975e538e23a0b1371bed90a34e51a9c7dba @sachin87 sachin87 committed Jan 21, 2012
Showing with 3 additions and 2 deletions.
  1. +3 −2 actionmailer/lib/action_mailer/base.rb
@@ -409,7 +409,7 @@ def receive(raw_mail)
# and passing a Mail::Message will do nothing except tell the logger you sent the email.
def deliver_mail(mail) #:nodoc:
ActiveSupport::Notifications.instrument("deliver.action_mailer") do |payload|
- self.set_payload_for_mail(payload, mail)
+ set_payload_for_mail(payload, mail)
yield # Let Mail do the delivery actions
end
end
@@ -612,7 +612,8 @@ def mail(headers={}, &block)
parts_order = headers[:parts_order]
# Call all the procs (if any)
- default_values = self.class.default.merge(self.class.default) do |k,v|
+ class_default = self.class.default
+ default_values = class_default.merge(class_default) do |k,v|
v.respond_to?(:call) ? v.bind(self).call : v
end

0 comments on commit c176397

Please sign in to comment.