github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 07:37:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Don't allow invalid email to be saved.

Browse Source
This commit is contained in:
Guo Xiang Tan
2016-12-21 17:00:45 +08:00
parent 5d7f3223f0
commit 13c6191e89
13 changed files with 97 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -1,5 +1,6 @@
require_dependency 'email'
require_dependency 'email_token'
require_dependency 'email_validator'
require_dependency 'trust_level'
require_dependency 'pbkdf2'
require_dependency 'discourse'
@ -76,6 +77,7 @@ class User < ActiveRecord::Base
validates_presence_of :username
validate :username_validator, if: :username_changed?
validates :email, presence: true, uniqueness: true
validates :email, format: { with: EmailValidator.email_regex }, if: :email_changed?
validates :email, email: true, if: :should_validate_email?
validate :password_validator
validates :name, user_full_name: true, if: :name_changed?