Move address_from_name_and_email to mail handler.

1 files changed, 13 insertions, 0 deletions

diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb
index fd2fa627f..bc4bf564c 100644
--- a/lib/mail_handler/backends/mail_backend.rb
+++ b/lib/mail_handler/backends/mail_backend.rb
@@ -29,6 +29,19 @@ module MailHandler
                 part_file_name.nil? ? nil : part_file_name.dup
             end
 
+            # Format
+            def address_from_name_and_email(name, email)
+                if !MySociety::Validate.is_valid_email(email)
+                    raise "invalid email " + email + " passed to address_from_name_and_email"
+                end
+                if name.nil?
+                    return Mail::Address.new(email)
+                end
+                address = Mail::Address.new
+                address.display_name = name
+                address.address = email
+                address.to_s
+            end
         end
     end
 end
\ No newline at end of file