diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-02 19:31:45 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2006-09-02 19:31:45 +0000 |
| commit | bf2bddd29fca60754d6aba60b55d109f5b78fb48 (patch) | |
| tree | c4c3962ed2cea5d9c26360f901fe317689a1b076 /actionmailer | |
| parent | 9db407f5786d96373d1534faa79c3220685b8ae0 (diff) | |
| download | rails-bf2bddd29fca60754d6aba60b55d109f5b78fb48.tar.gz rails-bf2bddd29fca60754d6aba60b55d109f5b78fb48.tar.bz2 rails-bf2bddd29fca60754d6aba60b55d109f5b78fb48.zip | |
Fixed that iconv decoding should catch InvalidEncoding #3153 [jon@siliconcircus.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4901 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb index a56e2267ee..c73157fe61 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb @@ -80,7 +80,7 @@ module TMail def convert_to(text, to, from) return text unless to && from text ? Iconv.iconv(to, from, text).first : "" - rescue Iconv::IllegalSequence, Errno::EINVAL + rescue Iconv::IllegalSequence, Iconv::InvalidEncoding, Errno::EINVAL # the 'from' parameter specifies a charset other than what the text # actually is...not much we can do in this case but just return the # unconverted text. |