131 tests, 309 assertions, 0 failures, 0 errors

4 files changed, 7 insertions, 27 deletions

diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index 006e865cf1..9281008cd4 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -41,6 +41,7 @@ module ActionMailer
   autoload :TestCase, 'action_mailer/test_case'
   autoload :TestHelper, 'action_mailer/test_helper'
   autoload :Utils, 'action_mailer/utils'
+
 end
 
 module Text
@@ -53,5 +54,5 @@ end
 
 autoload :MailHelper, 'action_mailer/mail_helper'
 
+
 require '/Users/mikel/ruby_programs/mail/lib/mail'
-require 'action_mailer/vendor/tmail_compat'
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/
diff --git a/actionmailer/lib/action_mailer/quoting.rb b/actionmailer/lib/action_mailer/quoting.rb
index 94fa042002..b30441f9de 100644
--- a/actionmailer/lib/action_mailer/quoting.rb
+++ b/actionmailer/lib/action_mailer/quoting.rb
@@ -43,7 +43,7 @@ module ActionMailer
     # "to", "from", "cc", "bcc" and "reply-to" headers.
     def quote_address_if_necessary(address, charset)
       if Array === address
-        address.map { |a| quote_address_if_necessary(a, charset) }
+        address.map { |a| quote_address_if_necessary(a, charset) }.join(", ")
       elsif address =~ /^(\S.*)\s+(<.*>)$/
         address = $2
         phrase = quote_if_necessary($1.gsub(/^['"](.*)['"]$/, '\1'), charset)
diff --git a/actionmailer/lib/action_mailer/vendor/tmail_compat.rb b/actionmailer/lib/action_mailer/vendor/tmail_compat.rb
deleted file mode 100644
index 0e240eb478..0000000000
--- a/actionmailer/lib/action_mailer/vendor/tmail_compat.rb
+++ /dev/null
@@ -1,22 +0,0 @@
-# TMail Compatibility File
-# Created in 1.2 of Mail.  Will be deprecated
-STDERR.puts("DEPRECATION WARNING, Mail running in TMail compatibility mode.  This will be deprecated soon.")
-
-class Mail::Message
-  
-  def set_content_disposition(*args)
-    STDERR.puts("DEPRECATION WARNING, Message#set_content_disposition is deprecated, please use Message#content_disposition")
-    content_disposition(args)
-  end
-
-  def encoding=(val)
-    STDERR.puts("DEPRECATION WARNING, Message#encoding= is deprecated, please use Message#content_transfer_encoding")
-    content_transfer_encoding(val)
-  end
-  
-  def quoted_body
-    STDERR.puts("DEPRECATION WARNING, Body#quoted_body is deprecated, please use Message => Body#encoded")
-    body.decoded
-  end
-  
-end