github-mirror/discourse
github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-23 23:16:06 +08:00
Code Issues Actions1 Packages Projects Releases Wiki Activity

FIX: remove unneeded code

Browse Source
This commit is contained in:
Arpit Jalan 2017-07-11 13:20:56 +05:30
parent 31932813b7
commit 35fb45749d
1 changed files with 1 additions and 4 deletions

5
app/models/invite_redeemer.rb

@ -19,9 +19,6 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
# extracted from User cause it is very specific to invites # extracted from User cause it is very specific to invites
def self.create_user_from_invite(invite, username, name, password=nil, user_custom_fields=nil) def self.create_user_from_invite(invite, username, name, password=nil, user_custom_fields=nil)
user_exists = User.where(admin: false).find_by_email(invite.email)
return user if user_exists
if username && UsernameValidator.new(username).valid_format? && User.username_available?(username) if username && UsernameValidator.new(username).valid_format? && User.username_available?(username)
available_username = username available_username = username
else else
@ -94,7 +91,7 @@ InviteRedeemer = Struct.new(:invite, :username, :name, :password, :user_custom_f
end end
def get_existing_user def get_existing_user
User.find_by(email: invite.email) User.where(admin: false).find_by(email: invite.email)
end end