Merge branch 'format-admin-form-from-address' into develop

2 files changed, 19 insertions, 1 deletions

diff --git a/app/mailers/contact_mailer.rb b/app/mailers/contact_mailer.rb
index 7c48bfd4b..58e036d3b 100644
--- a/app/mailers/contact_mailer.rb
+++ b/app/mailers/contact_mailer.rb
@@ -10,7 +10,7 @@ class ContactMailer < ApplicationMailer
     def to_admin_message(name, email, subject, message, logged_in_user, last_request, last_body)
         @message, @logged_in_user, @last_request, @last_body = message, logged_in_user, last_request, last_body
 
-        mail(:from => "#{name} <#{email}>",
+        mail(:from => MailHandler.address_from_name_and_email(name, email),
              :to => contact_from_name_and_email,
              :subject => subject)
     end
diff --git a/spec/mailers/contact_mailer_spec.rb b/spec/mailers/contact_mailer_spec.rb
new file mode 100644
index 000000000..a0431afd2
--- /dev/null
+++ b/spec/mailers/contact_mailer_spec.rb
@@ -0,0 +1,18 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ContactMailer do
+
+    describe :to_admin_message do
+
+        it 'correctly quotes the name in a "from" address' do
+            ContactMailer.to_admin_message("A,B,C.",
+                                           "test@example.com",
+                                           "test",
+                                           "test", nil, nil, nil)['from'].to_s.should == '"A,B,C." <test@example.com>'
+
+
+        end
+
+    end
+end