IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: mark user as approved if an invite is already present

Browse Source
This commit is contained in:
Arpit Jalan
2015-06-26 01:21:26 +05:30
parent 0a9e2f54ff
commit 03665e8466
3 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/email_token.rb
View File

@@ -60,7 +60,7 @@ class EmailToken < ActiveRecord::Base
end
end
# redeem invite, if available
Invite.redeem_from_email(user.email)
return User.find_by(email: Email.downcase(user.email)) if Invite.redeem_from_email(user.email).present?
user
rescue ActiveRecord::RecordInvalid
# If the user's email is already taken, just return nil (failure)