Merge remote-tracking branch 'upstream/pull/4699'

[rails.git] / app / controllers / concerns / email_methods.rb

diff --git a/app/controllers/concerns/email_methods.rb b/app/controllers/concerns/email_methods.rb
index 471a61e6aafb052ba9bea9346a1045666f4e2fbc..f25b7917ebc5af719947181aa465c052d7dce4f4 100644 (file)
--- a/app/controllers/concerns/email_methods.rb
+++ b/app/controllers/concerns/email_methods.rb
@@ -4,11 +4,7 @@ module EmailMethods
   private
 
   def canonical_email(email)
   private
 
   def canonical_email(email)

-    local_part, domain = if email.nil?
-                           nil
-                         else
-                           email.split("@")
-                         end
+    local_part, domain = email.split("@")

 
     local_part.sub!(/\+.*$/, "")
 
 
     local_part.sub!(/\+.*$/, "")