aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-06-17 15:02:10 -0700
committerLouise Crow <louise.crow@gmail.com>2013-06-17 15:02:10 -0700
commit52d43ecf01cc22aa0fcad82f46b577bb55126ccc (patch)
treef79b3f7ddf1d95f040d027c7650c25c48f60dee2 /lib
parentb1bb9d81f624936a49142c8f98fd7f0643e169fe (diff)
parent4a4169c606e0e26b905e11e1fc75c45268498112 (diff)
Merge branch 'hotfix/0.11.0.13' into wdtk
Diffstat (limited to 'lib')
-rw-r--r--lib/mail_handler/backends/mail_backend.rb2
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