diff options
| author | wycats <wycats@gmail.com> | 2010-04-13 14:07:46 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-13 14:07:46 -0700 |
| commit | 8e9df34fa3fd22719d939ba72f19b3ae9ffcc018 (patch) | |
| tree | fb7d56ee45fcf33ac78f6591e1fcd8d8de3a54c4 /actionmailer/lib/action_mailer/base.rb | |
| parent | dc251389d1ab4303b80a22642f4241940b73cbe7 (diff) | |
| parent | b4fd5e6f1a00b7c2b482de3d3b99a27adeba5920 (diff) | |
| download | rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.gz rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.tar.bz2 rails-8e9df34fa3fd22719d939ba72f19b3ae9ffcc018.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -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 |