diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-26 19:15:20 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-26 19:15:32 +0100 |
| commit | af43674c1cc73630736537a73e79a24ac2bef995 (patch) | |
| tree | a012a938a47edac1ca987024dce2c79224359875 /actionmailer/lib/action_mailer/old_api.rb | |
| parent | bdc39fad3629f89f552e40d13b7612db15ffa552 (diff) | |
| download | rails-af43674c1cc73630736537a73e79a24ac2bef995.tar.gz rails-af43674c1cc73630736537a73e79a24ac2bef995.tar.bz2 rails-af43674c1cc73630736537a73e79a24ac2bef995.zip | |
Fix failing tests on AM about render(:body => Hash).
Diffstat (limited to 'actionmailer/lib/action_mailer/old_api.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index 22c3c518b1..4694958222 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -204,12 +204,8 @@ module ActionMailer def create_parts if String === @body - self.response_body = @body - end - - if String === response_body - @parts.unshift create_inline_part(response_body) - else + @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) end |