diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-19 16:20:11 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-03-19 16:20:11 +0000 |
| commit | 63e063308b088b8eaef9730903810e54409058f5 (patch) | |
| tree | 0c64d409cd921e75d0d1b47f3204219de9ec83c4 /actionmailer | |
| parent | 1f6c871856b054ed0eb159a5a4449649ac5f69ab (diff) | |
| download | rails-63e063308b088b8eaef9730903810e54409058f5.tar.gz rails-63e063308b088b8eaef9730903810e54409058f5.tar.bz2 rails-63e063308b088b8eaef9730903810e54409058f5.zip | |
Dont choke on nil bodies
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@919 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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) |