diff options
| author | José Valim <jose.valim@gmail.com> | 2010-04-13 23:04:22 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-04-13 23:04:22 +0200 |
| commit | b4fd5e6f1a00b7c2b482de3d3b99a27adeba5920 (patch) | |
| tree | 18e5c5c414573a00ca0ac06712a8cb2e8b76e422 /actionmailer/lib/action_mailer | |
| parent | 518891f4907c9967cad22552eac110e81a0d44c0 (diff) | |
| download | rails-b4fd5e6f1a00b7c2b482de3d3b99a27adeba5920.tar.gz rails-b4fd5e6f1a00b7c2b482de3d3b99a27adeba5920.tar.bz2 rails-b4fd5e6f1a00b7c2b482de3d3b99a27adeba5920.zip | |
template_name and template_path should not be added to mail headers.
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 9c0f5d0ac3..d827ccdf2b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -541,7 +541,7 @@ module ActionMailer #:nodoc: wrap_delivery_behavior!(headers.delete(:delivery_method)) # Assign all headers except parts_order, content_type and body - assignable = headers.except(:parts_order, :content_type, :body) + assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path) assignable.each { |k, v| m[k] = v } # Render the templates and blocks |