diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-24 19:35:12 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-24 22:17:25 +0100 |
| commit | 9d7d6cd7baf9b9e552a2ece8fca7f381417d06c1 (patch) | |
| tree | 4c2dee901f2baefe858ff8e981247cae86bfdc42 /actionmailer | |
| parent | a39c7505bd69e9da0a122fbb8fe20612390c57ff (diff) | |
| download | rails-9d7d6cd7baf9b9e552a2ece8fca7f381417d06c1.tar.gz rails-9d7d6cd7baf9b9e552a2ece8fca7f381417d06c1.tar.bz2 rails-9d7d6cd7baf9b9e552a2ece8fca7f381417d06c1.zip | |
Use render instead render_to_body.
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index e198543c34..d647069fc7 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -605,7 +605,7 @@ module ActionMailer #:nodoc: each_template(templates_path, templates_name) do |template| responses << { - :body => render_to_body(:_template => template), + :body => render(:_template => template), :content_type => template.mime_type.to_s } end diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index 936ceb0dd6..941261a5b4 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -207,7 +207,7 @@ module ActionMailer @parts.unshift create_inline_part(@body) elsif @parts.empty? || @parts.all? { |p| p.content_disposition =~ /^attachment/ } self.class.view_paths.first.find_all(@template, {}, @mailer_name).each do |template| - @parts << create_inline_part(render_to_body(:_template => template), template.mime_type) + @parts << create_inline_part(render(:_template => template), template.mime_type) end if @parts.size > 1 |