diff options
| author | Sachin87 <singhsachin87@yahoo.com> | 2012-01-22 03:09:17 +0530 |
|---|---|---|
| committer | Sachin87 <singhsachin87@yahoo.com> | 2012-01-22 10:01:10 +0530 |
| commit | c1763975e538e23a0b1371bed90a34e51a9c7dba (patch) | |
| tree | 99ca802c923a1b9166a4a1417324ba88e1c321d7 /actionmailer/lib | |
| parent | 787cac159c9bb28543c4c8e4e76a924fa975daa3 (diff) | |
| download | rails-c1763975e538e23a0b1371bed90a34e51a9c7dba.tar.gz rails-c1763975e538e23a0b1371bed90a34e51a9c7dba.tar.bz2 rails-c1763975e538e23a0b1371bed90a34e51a9c7dba.zip | |
some modifications in action_mailer/base.rb
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 7d8852f961..f5d1121fa5 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -409,7 +409,7 @@ module ActionMailer #:nodoc: # 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 @@ module ActionMailer #:nodoc: 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 |