github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 23:54:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fix build (cc @tgxworld)

Browse Source
This commit is contained in:
Régis Hanol 2017-05-05 13:13:49 +02:00 committed by GitHub
parent e61959e6a8
commit 8bc47d0bae
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/group.rb
View File

@ -114,8 +114,8 @@ class Group < ActiveRecord::Base
incoming_email.split("|").each do |email|
escaped = Rack::Utils.escape_html(email)
self.errors.add(:base, I18n.t('groups.errors.invalid_incoming_email', email: escaped))
if !Email.is_valid?(email)
self.errors.add(:base, I18n.t('groups.errors.invalid_incoming_email', email: escaped))
elsif group = Group.where.not(id: self.id).find_by_email(email)
self.errors.add(:base, I18n.t('groups.errors.email_already_used_in_group', email: escaped, group_name: Rack::Utils.escape_html(group.name)))
elsif category = Category.find_by_email(email)