IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 12:43:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2905 from techAPJ/patch-3

Browse Source 
FIX: disposable invite was giving email validation error
This commit is contained in:
Robin Ward 2014-10-23 13:35:05 -04:00
commit e341fe9701
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/validators/email_validator.rb
View File

@ -10,7 +10,7 @@ class EmailValidator < ActiveModel::EachValidator
record.errors.add(attribute, I18n.t(:'user.email.not_allowed'))
end
end
if record.errors[attribute].blank? and ScreenedEmail.should_block?(value)
if record.errors[attribute].blank? && value && ScreenedEmail.should_block?(value)
record.errors.add(attribute, I18n.t(:'user.email.blocked'))
end
end
@ -25,4 +25,4 @@ class EmailValidator < ActiveModel::EachValidator
/^[a-zA-Z0-9!#\$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-zA-Z0-9!#\$%&'\*+\/=?\^_`{|}~\-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?$/
end
end
end