From b354496bda901cb0af499d6f3dff17a96a834a67 Mon Sep 17 00:00:00 2001 From: Mikel Lindsaar Date: Mon, 28 Dec 2009 21:41:16 +1100 Subject: [PATCH] Adding default 8bit encoding if the body has non usascii in it --- actionmailer/lib/action_mailer/base.rb | 2 ++ actionmailer/test/mail_service_test.rb | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index cd9bbd2d7b..aea2498d4d 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -593,6 +593,8 @@ module ActionMailer #:nodoc: end end + m.content_transfer_encoding = '8bit' unless m.body.only_us_ascii? + @mail = m end diff --git a/actionmailer/test/mail_service_test.rb b/actionmailer/test/mail_service_test.rb index bebd8df8e9..152900259d 100644 --- a/actionmailer/test/mail_service_test.rb +++ b/actionmailer/test/mail_service_test.rb @@ -107,7 +107,7 @@ class TestMailer < ActionMailer::Base cc "Foo áëô îü " bcc "Foo áëô îü " charset "utf-8" - + render :text => "åœö blah" end