diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-06-17 15:33:26 -0700 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-06-17 15:33:26 -0700 |
| commit | 6a6431abd38ae8b4b62caf457d0e991651826def (patch) | |
| tree | 5655e2b4170dd772c68eec30f03f4657b7c3a689 /lib | |
| parent | b78b3610988735652e6eb17004dfa116b0fe2f15 (diff) | |
| parent | 4a4169c606e0e26b905e11e1fc75c45268498112 (diff) | |
Merge branch 'hotfix/0.11.0.13' into rails-3-develop
Conflicts:
spec/mailers/outgoing_mailer_spec.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mail_handler/backends/mail_backend.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb index 561946980..28c486e1b 100644 --- a/lib/mail_handler/backends/mail_backend.rb +++ b/lib/mail_handler/backends/mail_backend.rb @@ -112,7 +112,7 @@ module MailHandler if first_from.is_a?(ActiveSupport::Multibyte::Chars) return nil else - return first_from.display_name ? eval(%Q{"#{first_from.display_name}"}) : nil + return (first_from.display_name || nil) end else return nil |