github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 19:00:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix NilClass error in UsersController.

Browse Source
This commit is contained in:
Guo Xiang Tan 2017-04-04 14:17:45 +08:00
parent aca972c08b
commit 406d721f11
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/users_controller.rb
View File

@ -392,12 +392,12 @@ class UsersController < ApplicationController
token = params[:token]
if EmailToken.valid_token_format?(token)
if request.put?
@user = EmailToken.confirm(token)
else
email_token = EmailToken.confirmable(token)
@user = email_token.try(:user)
end
@user =
if request.put?
EmailToken.confirm(token)
else
EmailToken.confirmable(token)&.user
end
if @user
secure_session["password-#{token}"] = @user.id
@ -438,11 +438,11 @@ class UsersController < ApplicationController
format.json do
if request.put?
if @error || @user.errors&.any?
if @error || @user&.errors&.any?
render json: {
success: false,
message: @error,
errors: @user.errors.to_hash,
errors: @user&.errors.to_hash,
is_developer: UsernameCheckerService.is_developer?(@user.email)
}
else