github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 19:39:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

REFACTOR: Always validate email by default.

Browse Source
This commit is contained in:
Guo Xiang Tan
2017-10-25 13:02:18 +08:00
parent d9a9ad3edb
commit defea6245c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/user.rb
View File

@ -89,7 +89,7 @@ class User < ActiveRecord::Base
after_initialize :add_trust_level
before_validation :set_should_validate_email
before_validation :set_skip_validate_email
after_create :create_email_token
after_create :create_user_stat
@ -1097,9 +1097,9 @@ class User < ActiveRecord::Base
true
end
def set_should_validate_email
def set_skip_validate_email
if self.primary_email
self.primary_email.should_validate_email = should_validate_email_address?
self.primary_email.skip_validate_email = !should_validate_email_address?
end
true