File tree Expand file tree Collapse file tree 1 file changed +5
-0
lines changed Expand file tree Collapse file tree 1 file changed +5
-0
lines changed Original file line number Diff line number Diff line change @@ -292,6 +292,8 @@ def user_from_params_or_current_user
292
292
params [ :for_user_id ] ? User . find ( params [ :for_user_id ] ) : current_user
293
293
end
294
294
295
+ FROM_STAGED = "from_staged"
296
+
295
297
def create
296
298
params . permit ( :user_fields )
297
299
@@ -314,6 +316,8 @@ def create
314
316
if user = User . where ( staged : true ) . find_by ( email : params [ :email ] . strip . downcase )
315
317
user_params . each { |k , v | user . send ( "#{ k } =" , v ) }
316
318
user . staged = false
319
+ user . active = false
320
+ user . custom_fields [ FROM_STAGED ] = true
317
321
else
318
322
user = User . new ( user_params )
319
323
end
@@ -608,6 +612,7 @@ def update_activation_email
608
612
raise Discourse ::InvalidAccess . new unless @user . present?
609
613
raise Discourse ::InvalidAccess . new if @user . active?
610
614
raise Discourse ::InvalidAccess . new if current_user . present?
615
+ raise Discourse ::InvalidAccess . new if @user . custom_fields [ FROM_STAGED ]
611
616
612
617
User . transaction do
613
618
@user . email = params [ :email ]
You can’t perform that action at this time.
0 commit comments