From 63e063308b088b8eaef9730903810e54409058f5 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 19 Mar 2005 16:20:11 +0000 Subject: Dont choke on nil bodies git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@919 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionmailer') diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb index 1a882934c9..d460ece5a1 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb @@ -4,11 +4,11 @@ require 'base64' module TMail class Mail def unquoted_subject(to_charset = 'utf-8') - Unquoter.unquote_and_convert_to(subject, to_charset) + Unquoter.unquote_and_convert_to(subject || "", to_charset) end def unquoted_body(to_charset = 'utf-8') - Unquoter.unquote_and_convert_to(body, to_charset, header["content-type"]["charset"]) + Unquoter.unquote_and_convert_to(body || "", to_charset, header["content-type"]["charset"]) end def unquoted_body_with_all_parts(to_charset = 'utf-9', &block) -- cgit v1.2.3