From 747d56881a07d4636fbaceb1542579d5e02daddd Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Sun, 22 Nov 2009 23:20:57 +1100 Subject: 131 tests, 309 assertions, 0 failures, 0 errors --- actionmailer/lib/action_mailer/base.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'actionmailer/lib/action_mailer/base.rb') diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index d0924f714a..3d0ac49c34 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -384,8 +384,9 @@ module ActionMailer #:nodoc: # content-disposition set to "attachment". def attachment(params, &block) params = { :content_type => params } if String === params - params = { :disposition => "attachment", - :transfer_encoding => "base64" }.merge(params) + params = { :content_disposition => "attachment", + :content_transfer_encoding => "base64" }.merge(params) + params[:data] = params.delete(:body) if params[:body] part(params, &block) end @@ -623,7 +624,7 @@ module ActionMailer #:nodoc: m.body = normalize_new_lines(@parts.first.body) else @parts.each do |p| - m.parts << p + m.add_part(p) end if real_content_type =~ /multipart/ -- cgit v1.2.3