diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-11-29 15:06:07 +0000 |
| commit | eb1432f9992275df485f8502ad3ab6f7c8d494b7 (patch) | |
| tree | ec20310d47c7f4e4cd136ac1671b32db4a379ea7 /lib/mail_handler/backends/mail_backend.rb | |
| parent | 5ddd0620f8023c4bbf7d82e61f841dadd73bb7ba (diff) | |
| parent | 20089cf7b5045d504b7240bc92e2b6068fcc2246 (diff) | |
Merge remote-tracking branch 'origin/merged-rails-3-2-assset-pipeline' into rails-3-develop
Conflicts:
Gemfile.lock
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) |