github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-31 14:08:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: activate user even if email token is already confirmed

Browse Source
This commit is contained in:
Arpit Jalan
2018-02-14 20:22:05 +05:30
parent 8ae2c4555a
commit f07b1a5c05
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/user.rb
View File

@ -743,7 +743,8 @@ class User < ActiveRecord::Base
def activate
if email_token = self.email_tokens.active.where(email: self.email).first
EmailToken.confirm(email_token.token)
user = EmailToken.confirm(email_token.token)
self.update!(active: true) if user.nil?
else
self.update!(active: true)
end