aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormlbileschi <mlbileschi@gmail.com>2015-08-11 16:30:47 -0400
committermlbileschi <mlbileschi@gmail.com>2015-08-11 16:30:47 -0400
commit738be4457b964fe5e46d2eb7797e9055c4876de8 (patch)
tree28d6f19643cbec9314dbe8a309cb43e3809d3317
parentdf5ada78c0b0e962d65e89e7487fd35289dc9157 (diff)
downloadrails-738be4457b964fe5e46d2eb7797e9055c4876de8.tar.gz
rails-738be4457b964fe5e46d2eb7797e9055c4876de8.tar.bz2
rails-738be4457b964fe5e46d2eb7797e9055c4876de8.zip
fix comment about which mail headers are excluded
-rw-r--r--actionmailer/lib/action_mailer/base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 7022c04a9a..6f49e130d8 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -820,7 +820,7 @@ module ActionMailer
# Set configure delivery behavior
wrap_delivery_behavior!(headers.delete(:delivery_method), headers.delete(:delivery_method_options))
- # Assign all headers except parts_order, content_type and body
+ # Assign all headers except parts_order, content_type, body, template_name, and template_path
assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
assignable.each { |k, v| m[k] = v }