Dont choke on nil bodies

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@919 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
rails · Mar 19, 2005 · 63e0633 · 63e0633
1 parent 1f6c871
commit 63e0633
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb
@@ -4,11 +4,11 @@
 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)