diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-20 21:19:10 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2009-11-20 21:19:10 +1100 |
| commit | a5e6295d72733b0ab4d5cff1003574e98913bae8 (patch) | |
| tree | 75269fc3f209e28bc4e51579b0011e8449de5ba6 /actionmailer/lib/action_mailer/base.rb | |
| parent | 539d9b355f40b1668b4ad4e8fe628e0a3d9760b8 (diff) | |
| download | rails-a5e6295d72733b0ab4d5cff1003574e98913bae8.tar.gz rails-a5e6295d72733b0ab4d5cff1003574e98913bae8.tar.bz2 rails-a5e6295d72733b0ab4d5cff1003574e98913bae8.zip | |
Down to 30 failures total
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index d5deb96427..d0924f714a 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -573,8 +573,8 @@ module ActionMailer #:nodoc: order = order.collect { |s| s.downcase } parts = parts.sort do |a, b| - a_ct = a.content_type.content_type.downcase - b_ct = b.content_type.content_type.downcase + a_ct = a.content_type.string.downcase + b_ct = b.content_type.string.downcase a_in = order.include? a_ct b_in = order.include? b_ct @@ -615,11 +615,11 @@ module ActionMailer #:nodoc: if @parts.empty? main_type, sub_type = split_content_type(real_content_type) - m.content_type(main_type, sub_type, ctype_attrs) + m.content_type([main_type, sub_type, ctype_attrs]) m.body = normalize_new_lines(body) elsif @parts.size == 1 && @parts.first.parts.empty? main_type, sub_type = split_content_type(real_content_type) - m.content_type(main_type, sub_type, ctype_attrs) + m.content_type([main_type, sub_type, ctype_attrs]) m.body = normalize_new_lines(@parts.first.body) else @parts.each do |p| @@ -629,7 +629,7 @@ module ActionMailer #:nodoc: if real_content_type =~ /multipart/ ctype_attrs.delete "charset" main_type, sub_type = split_content_type(real_content_type) - m.content_type([main_type.to_s, sub_type.to_s, ctype_attrs]) + m.content_type([main_type, sub_type, ctype_attrs]) end end |