aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorJamis Buck <jamis@37signals.com>2006-03-18 23:06:25 +0000
committerJamis Buck <jamis@37signals.com>2006-03-18 23:06:25 +0000
commita46214c4f9e7117796f2a5ed1414a83c2ca4c6bd (patch)
tree6ffcb1793b324c3699e0f77aef6579139ea14518 /actionmailer/lib
parent797de4d057ff226e4e7d689da537472396bf6f86 (diff)
downloadrails-a46214c4f9e7117796f2a5ed1414a83c2ca4c6bd.tar.gz
rails-a46214c4f9e7117796f2a5ed1414a83c2ca4c6bd.tar.bz2
rails-a46214c4f9e7117796f2a5ed1414a83c2ca4c6bd.zip
Make custom headers work in subparts (closes #4034)
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3956 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/part.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/part.rb b/actionmailer/lib/action_mailer/part.rb
index 0036d04da0..7bdbf5345d 100644
--- a/actionmailer/lib/action_mailer/part.rb
+++ b/actionmailer/lib/action_mailer/part.rb
@@ -96,7 +96,9 @@ module ActionMailer
part.set_content_type(content_type, nil, { "charset" => charset }) if content_type =~ /multipart/
end
-
+
+ @headers.each { |k,v| part[k] = v }
+
part
end