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

FIX: send activation email if user have unconfirmed email

Browse Source
This commit is contained in:
Arpit Jalan
2017-03-20 15:10:48 +05:30
parent 32d8447838
commit 7c3ae50dcd
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -585,7 +585,7 @@ class UsersController < ApplicationController
session.delete(SessionController::ACTIVATE_USER_KEY)
if @user.active
if @user.active && @user.email_confirmed?
render_json_error(I18n.t('activation.activated'), status: 409)
else
@email_token = @user.email_tokens.unconfirmed.active.first