From f091bd67b3ef5f4cd85dbd70cbd11e9ad2711562 Mon Sep 17 00:00:00 2001 From: MQuy Date: Fri, 6 Jan 2017 18:37:33 +0800 Subject: Remove unnecessary condition in content_type --- actionmailer/lib/action_mailer/base.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index a7015b1e6d..35c793351f 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -922,7 +922,7 @@ module ActionMailer def collect_responses_from_text(headers) [{ body: headers.delete(:body), - content_type: headers[:content_type] || self.class.default[:content_type] || "text/plain" + content_type: headers[:content_type] || "text/plain" }] end -- cgit v1.2.3