From 9cf33b55f39779b98604e1652affc2c64873dd9b Mon Sep 17 00:00:00 2001
From: Nate Berkopec <nate.berkopec@gmail.com>
Date: Sat, 27 Oct 2012 14:28:42 -0400
Subject: Explicit multipart messages respect :parts_order

As issue #7978, the order in which ActionMailer
sends multipart messages could be unintentionally
overwritten if a block is passed to the mail
method. This changes the mail method such that
:parts_order is always respected, regardless of
whether a block is passed to mail.
---
 actionmailer/CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'actionmailer/CHANGELOG.md')

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 28a5c0ab71..af91907f46 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Rails 4.0.0 (unreleased) ##
 
+* Explicit multipart messages no longer set the order of the MIME parts.
+  *Nate Berkopec*
+  
 * Do not render views when mail() isn't called.
   Fix #7761
 
-- 
cgit v1.2.3