Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 4901

Show
Ignore:
Timestamp:
09/02/06 19:31:45 (2 years ago)
Author:
david
Message:

Fixed that iconv decoding should catch InvalidEncoding #3153 [jon@siliconcircus.com]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb

    r3475 r4901  
    8181          return text unless to && from 
    8282          text ? Iconv.iconv(to, from, text).first : "" 
    83         rescue Iconv::IllegalSequence, Errno::EINVAL 
     83        rescue Iconv::IllegalSequence, Iconv::InvalidEncoding, Errno::EINVAL 
    8484          # the 'from' parameter specifies a charset other than what the text 
    8585          # actually is...not much we can do in this case but just return the