Skip to content

Commit 2fd2a17

Browse files
committed
Merge remote-tracking branch 'origin/stable' into pkgr
2 parents 9991494 + 5748ad6 commit 2fd2a17

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

app/controllers/users_controller.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@ def user_from_params_or_current_user
292292
params[:for_user_id] ? User.find(params[:for_user_id]) : current_user
293293
end
294294

295+
FROM_STAGED = "from_staged"
296+
295297
def create
296298
params.permit(:user_fields)
297299

@@ -314,6 +316,8 @@ def create
314316
if user = User.where(staged: true).find_by(email: params[:email].strip.downcase)
315317
user_params.each { |k, v| user.send("#{k}=", v) }
316318
user.staged = false
319+
user.active = false
320+
user.custom_fields[FROM_STAGED] = true
317321
else
318322
user = User.new(user_params)
319323
end
@@ -608,6 +612,7 @@ def update_activation_email
608612
raise Discourse::InvalidAccess.new unless @user.present?
609613
raise Discourse::InvalidAccess.new if @user.active?
610614
raise Discourse::InvalidAccess.new if current_user.present?
615+
raise Discourse::InvalidAccess.new if @user.custom_fields[FROM_STAGED]
611616

612617
User.transaction do
613618
@user.email = params[:email]

0 commit comments

Comments
 (0)