summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan Fick <logaldeveloper@protonmail.com>2017-10-28 14:23:34 -0400
committerLogan Fick <logaldeveloper@protonmail.com>2017-10-28 14:23:34 -0400
commit0093daedd9b028ae633d773b540d807238448589 (patch)
tree7ecb37022a0e956d4489be2ff82041fa7bf4ef50
parentb1f739f6f8a1778151a80696819ce6ae6ea2c477 (diff)
Fixed name reuse check sometimes using wrong account to compare against.
-rw-r--r--app/controllers/users_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 366ba1a..4c854ea 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -141,7 +141,7 @@ class UsersController < ApplicationController
else
userdata = user_params([:name, :skype, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark])
end
- if User.find_by(name: userdata[:name]) && User.find_by(name: userdata[:name]) != current_user
+ if User.find_by(name: userdata[:name]) && User.find_by(name: userdata[:name]) != @user
flash[:alert] = "You have entered a name that belongs to someone else. Please try another."
redirect_to edit_user_path(@user)
return