From 37842229c949e1adae4dff6e8b0db74ba659488c Mon Sep 17 00:00:00 2001 From: yalab Date: Fri, 31 Dec 2010 21:35:45 +0900 Subject: [PATCH] Fix that email.body is not set charset. --- actionmailer/lib/action_mailer/base.rb | 2 +- actionmailer/test/base_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index d67d563..d8e2e0b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -626,7 +626,7 @@ module ActionMailer #:nodoc: # Setup content type, reapply charset and handle parts order m.content_type = set_content_type(m, content_type, headers[:content_type]) - m.charset = charset + m.body.charset = m.charset = charset if m.multipart? parts_order ||= explicit_order || headers[:parts_order] diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb index 7ed9d4a..192c2bc 100644 --- a/actionmailer/test/base_test.rb +++ b/actionmailer/test/base_test.rb @@ -44,6 +44,7 @@ class BaseTest < ActiveSupport::TestCase assert_equal(['cc@test.lindsaar.net'], email.cc) assert_equal('multipart/mixed; charset=iso-8559-1', email.content_type) assert_equal('iso-8559-1', email.charset) + assert_equal('iso-8559-1', email.body.charset) assert_equal('2.0', email.mime_version) assert_equal(['reply-to@test.lindsaar.net'], email.reply_to) assert_equal(@time, email.date) -- 1.7.3.2.164.g6f10c