diff options
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index d0d3c21a15..a90279d578 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -808,9 +808,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, body, template_name, and template_path - assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path) - assignable.each { |k, v| message[k] = v } + assign_headers_to_message(headers) # Render the templates and blocks responses = collect_responses(headers, &block) @@ -844,6 +842,11 @@ module ActionMailer end private :apply_defaults + def assign_headers_to_message(headers) + assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path) + assignable.each { |k, v| message[k] = v } + end + protected # Used by #mail to set the content type of the message. |