aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorhnatt <hnatt88@gmail.com>2015-10-30 08:56:00 +0200
committerhnatt <hnatt88@gmail.com>2015-10-30 08:56:00 +0200
commit2a55a6d2e518662d0f213cfe8c81b2eea66b5323 (patch)
treeace4fa0e10a2f04bf08bf8a4293d7a73f952e0a8 /actionmailer
parentc26abb86915c64fdf6a80aed27f48e16491d51d6 (diff)
downloadrails-2a55a6d2e518662d0f213cfe8c81b2eea66b5323.tar.gz
rails-2a55a6d2e518662d0f213cfe8c81b2eea66b5323.tar.bz2
rails-2a55a6d2e518662d0f213cfe8c81b2eea66b5323.zip
Pass message as argument to ActionMailer::Base#assign_headers_to_message
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index e7d646b360..0f7f271354 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -795,7 +795,7 @@ module ActionMailer
# end
#
def mail(headers = {}, &block)
- return @_message if @_mail_was_called && headers.blank? && !block
+ return message if @_mail_was_called && headers.blank? && !block
# At the beginning, do not consider class default for content_type
content_type = headers[:content_type]
@@ -808,7 +808,7 @@ module ActionMailer
# Set configure delivery behavior
wrap_delivery_behavior!(headers.delete(:delivery_method), headers.delete(:delivery_method_options))
- assign_headers_to_message(headers)
+ assign_headers_to_message(message, headers)
# Render the templates and blocks
responses = collect_responses(headers, &block)
@@ -828,6 +828,8 @@ module ActionMailer
message
end
+ private
+
def apply_defaults(headers)
default_values = self.class.default.map do |key, value|
[
@@ -840,9 +842,8 @@ module ActionMailer
headers_with_defaults[:subject] ||= default_i18n_subject
headers_with_defaults
end
- private :apply_defaults
- def assign_headers_to_message(headers)
+ def assign_headers_to_message(message, headers)
assignable = headers.except(:parts_order, :content_type, :body, :template_name, :template_path)
assignable.each { |k, v| message[k] = v }
end