From 7f28b7342c0fa082b3b55eebc5cfdec75c0b0631 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Thu, 25 Feb 2010 19:15:54 +0000 Subject: [PATCH] Improve email address validation and add validation of the new email address field. Closes #2744. --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 54b3fa371..0b8b512ee 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -24,8 +24,8 @@ class User < ActiveRecord::Base validates_uniqueness_of :email validates_length_of :pass_crypt, :within => 8..255 validates_length_of :display_name, :within => 3..255, :allow_nil => true - validates_length_of :email, :within => 6..255 - validates_format_of :email, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i + validates_email_format_of :email + validates_email_format_of :new_email, :allow_blank => true validates_format_of :display_name, :with => /^[^\/;.,?]*$/ validates_numericality_of :home_lat, :allow_nil => true validates_numericality_of :home_lon, :allow_nil => true -- 2.43.2