diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-01-24 11:24:55 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-01-24 11:24:55 +0000 |
| commit | 63586e47e1b53bca023fdbba83bff2cd138feaf3 (patch) | |
| tree | 5c9ed659c968f092317de6bab59a712e2584ca66 /lib/mail_handler/backends/mail_backend.rb | |
| parent | 80e66c0fba234fc78f13d5e7635f65d2bc25fe58 (diff) | |
| parent | b0a939a4d44077b4602176042ff4432b790561ad (diff) | |
Merge branch 'release/0.16' into wdtk
Diffstat (limited to 'lib/mail_handler/backends/mail_backend.rb')
| -rw-r--r-- | lib/mail_handler/backends/mail_backend.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb index 28c486e1b..e019eba97 100644 --- a/lib/mail_handler/backends/mail_backend.rb +++ b/lib/mail_handler/backends/mail_backend.rb @@ -95,7 +95,7 @@ module MailHandler def get_from_address(mail) first_from = first_from(mail) if first_from - if first_from.is_a?(ActiveSupport::Multibyte::Chars) + if first_from.is_a?(String) return nil else return first_from.address @@ -109,7 +109,7 @@ module MailHandler def get_from_name(mail) first_from = first_from(mail) if first_from - if first_from.is_a?(ActiveSupport::Multibyte::Chars) + if first_from.is_a?(String) return nil else return (first_from.display_name || nil) |