diff options
| author | Louise Crow <louise.crow@gmail.com> | 2015-05-28 10:57:19 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2015-05-28 10:57:19 +0100 |
| commit | e936b687a7df62dc69d1cc0493492346bd8e300a (patch) | |
| tree | 61206adc9f66b7bfc691174c9f93c92ccea1ffe9 /lib/mail_handler/backends/mail_backend.rb | |
| parent | c6e8e298fd0861cd822f23f370a01ccbc21cb9d3 (diff) | |
| parent | 495f82365ccd374d5b33339abce356f3a3662295 (diff) | |
Merge branch 'force-filenames-to-utf8' into rails-3-develop
Diffstat (limited to 'lib/mail_handler/backends/mail_backend.rb')
| -rw-r--r-- | lib/mail_handler/backends/mail_backend.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb index 5a7e0ef65..9e3fbc008 100644 --- a/lib/mail_handler/backends/mail_backend.rb +++ b/lib/mail_handler/backends/mail_backend.rb @@ -65,7 +65,12 @@ module MailHandler # Return a copy of the file name for the mail part def get_part_file_name(part) part_file_name = part.filename - part_file_name.nil? ? nil : part_file_name.dup + part_file_name = part_file_name.nil? ? nil : part_file_name.dup + if part_file_name + part_file_name = CGI.unescape(part_file_name) + part_file_name = convert_string_to_utf8(part_file_name, part.charset) + end + part_file_name end # Get the body of a mail part |