diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-28 14:44:34 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-03-28 14:44:34 +1100 |
| commit | 2bcc2ebf44b59e46c104c92d621e8051c97bfcf5 (patch) | |
| tree | d2a3f04fd3020c1b5d88847af62d52f2d5e5bd61 /actionmailer/lib/action_mailer/old_api.rb | |
| parent | f5774e3e3f70a3acfa559b9ff889e9417fb71d4b (diff) | |
| parent | 8398f21880a952769ccd6437a4344922fe596dab (diff) | |
| download | rails-2bcc2ebf44b59e46c104c92d621e8051c97bfcf5.tar.gz rails-2bcc2ebf44b59e46c104c92d621e8051c97bfcf5.tar.bz2 rails-2bcc2ebf44b59e46c104c92d621e8051c97bfcf5.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionmailer/lib/action_mailer/old_api.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index aeb653c5db..c7f341d46c 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -31,9 +31,6 @@ module ActionMailer # replies to this message. adv_attr_accessor :reply_to - # Specify additional headers to be added to the message. - adv_attr_accessor :headers - # Specify the order in which parts should be sorted, based on content-type. # This defaults to the value for the +default_implicit_parts_order+. adv_attr_accessor :implicit_parts_order @@ -207,7 +204,8 @@ module ActionMailer @parts.unshift create_inline_part(@body) elsif @parts.empty? || @parts.all? { |p| p.content_disposition =~ /^attachment/ } lookup_context.find_all(@template, @mailer_name).each do |template| - @parts << create_inline_part(render(:_template => template), template.mime_type) + self.formats = template.formats + @parts << create_inline_part(render(:template => template), template.mime_type) end if @parts.size > 1 |