diff options
| author | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-03-26 15:10:24 -0700 |
| commit | 197904341f2b2f21d69c653cede3aec124e86720 (patch) | |
| tree | 83f1234e238016126860a929594db22e1862d783 /actionmailer/lib/action_mailer/old_api.rb | |
| parent | 76d2c455c0607b4cd5f238cadef8f933a18567fb (diff) | |
| parent | b3a0aed028835ce4551c4a76742744a40a71b0be (diff) | |
| download | rails-197904341f2b2f21d69c653cede3aec124e86720.tar.gz rails-197904341f2b2f21d69c653cede3aec124e86720.tar.bz2 rails-197904341f2b2f21d69c653cede3aec124e86720.zip | |
Merge branch 'master' into docrails
Diffstat (limited to 'actionmailer/lib/action_mailer/old_api.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index fb4b6701dd..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,6 +204,7 @@ 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| + self.formats = template.formats @parts << create_inline_part(render(:template => template), template.mime_type) end |