diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-09-22 16:08:17 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-09-22 16:09:48 +0200 |
| commit | 7aca4a721ee9ba7f7ba4043f7199080cf7282d62 (patch) | |
| tree | 06432f8ef34308908003b7d22f3740dcd22dd751 /actionmailer/lib | |
| parent | 748105adccd62ac484cbb4c67c24194b5858055f (diff) | |
| parent | b37e8482caee6d406ac5933fceb60cd2b74adfb7 (diff) | |
| download | rails-7aca4a721ee9ba7f7ba4043f7199080cf7282d62.tar.gz rails-7aca4a721ee9ba7f7ba4043f7199080cf7282d62.tar.bz2 rails-7aca4a721ee9ba7f7ba4043f7199080cf7282d62.zip | |
Merge pull request #16974 from silp-com/mail_was_called
ActionMailer: mark mail as called after instead of before processing it
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/mail_helper.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index f539fc53c6..1ab68d2953 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -775,7 +775,6 @@ module ActionMailer def mail(headers = {}, &block) return @_message if @_mail_was_called && headers.blank? && !block - @_mail_was_called = true m = @_message # At the beginning, do not consider class default for content_type @@ -803,6 +802,8 @@ module ActionMailer # Render the templates and blocks responses = collect_responses(headers, &block) + @_mail_was_called = true + create_parts_from_responses(m, responses) # Setup content type, reapply charset and handle parts order diff --git a/actionmailer/lib/action_mailer/mail_helper.rb b/actionmailer/lib/action_mailer/mail_helper.rb index 483277af04..cc7935a7e0 100644 --- a/actionmailer/lib/action_mailer/mail_helper.rb +++ b/actionmailer/lib/action_mailer/mail_helper.rb @@ -29,7 +29,7 @@ module ActionMailer # Access the message attachments list. def attachments - @_message.attachments + mailer.attachments end # Returns +text+ wrapped at +len+ columns and indented +indent+ spaces. |