zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-07-21 10:06:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge domains

Browse source
This commit is contained in:
Kyle Drake 2016-02-19 19:39:24 -08:00
commit 7084cde42f
10 changed files with 1060 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
models/site.rb
View file

@ -843,6 +843,10 @@ class Site < Sequel::Model
errors.add :email, 'An email address is required.'
end
if parent? && values[:email] =~ /@neocities.org/
errors.add :email, 'Cannot use this email address.'
end
# Check for existing email if new or changing email.
if new? || @original_email
email_check = self.class.select(:id).filter(email: values[:email])