Ticket #8038: body_charset.patch

test/mail_service_test.rb

@@ -803 +803 @@
-  def test_multipart_with_template_path_with_dots
-    mail = FunkyPathMailer.create_multipart_with_template_path_with_dots(@recipient)
-    assert_equal 2, mail.parts.length
+    assert_equal 'text/plain', mail.parts[0].content_type
+    assert_equal 'utf-8', mail.parts[0].charset
-  end
-
-  def test_custom_content_type_attributes

lib/action_mailer/part_container.rb

@@ -41 +41 @@
-    private
-    
-      def parse_content_type(defaults=nil)
-
+
+
+
+
+
-        ctype, *attrs = content_type.split(/;\s*/)
-        attrs = attrs.inject({}) { |h,s| k,v = s.split(/=/, 2); h[k] = v; h }
-        [ctype, {"charset" => charset || defaults && defaults.charset}.merge(attrs)]