From 1be3ac8810112e0114d9ada9f8dc5d186a038fdc Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Mon, 9 Jan 2017 19:16:26 +0000 Subject: Merge branch 'fix-plain-text-emails' into 'master' Use #parts instead of #part to read all the parts of the Message. Closes #26463 See merge request !8507 --- lib/email_template_interceptor.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/email_template_interceptor.rb b/lib/email_template_interceptor.rb index fb04a7824b8..63f9f8d7a5a 100644 --- a/lib/email_template_interceptor.rb +++ b/lib/email_template_interceptor.rb @@ -5,8 +5,8 @@ class EmailTemplateInterceptor def self.delivering_email(message) # Remove HTML part if HTML emails are disabled. unless current_application_settings.html_emails_enabled - message.part.delete_if do |part| - part.content_type.try(:start_with?, 'text/html') + message.parts.delete_if do |part| + part.content_type.start_with?('text/html') end end end -- cgit v1.2.1