diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-14 05:30:52 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-14 05:30:52 +0000 |
commit | 12f8f8930794b2ae56630e846300c3aff0a7a58e (patch) | |
tree | 7ee4b4e95b7c830e70fd7f94e1d3c963dffc6a71 /actionmailer/lib | |
parent | 15f7f1a38041c0b3355f2a323f785465b44029f9 (diff) | |
download | rails-12f8f8930794b2ae56630e846300c3aff0a7a58e.tar.gz rails-12f8f8930794b2ae56630e846300c3aff0a7a58e.tar.bz2 rails-12f8f8930794b2ae56630e846300c3aff0a7a58e.zip |
Fix attachment decoding when using the TMail C extension. Closes #7861.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7476 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
-rwxr-xr-x | actionmailer/lib/action_mailer/vendor/tmail/base64.rb | 2 | ||||
-rw-r--r-- | actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/base64.rb b/actionmailer/lib/action_mailer/vendor/tmail/base64.rb index 8f89a489dc..5713827521 100755 --- a/actionmailer/lib/action_mailer/vendor/tmail/base64.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/base64.rb @@ -42,7 +42,7 @@ module TMail end def rb_decode( str, strict = false ) - str.unpack('m') + str.unpack('m').first end begin diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb index 694242349d..a7e5c44710 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb @@ -78,7 +78,7 @@ module TMail end def unquote_base64_and_convert_to(text, to, from) - convert_to(Base64.decode(text).first, to, from) + convert_to(Base64.decode(text), to, from) end begin |