diff options
author | Logan Fick <logaldeveloper@protonmail.com> | 2019-02-23 13:56:59 -0500 |
---|---|---|
committer | Logan Fick <logaldeveloper@protonmail.com> | 2019-02-23 13:56:59 -0500 |
commit | 244a047cad85690a29af12c2f3d7866fe9f79e40 (patch) | |
tree | 6fd083503c9917cc4c49fdc88efdf892f22014e1 /app/controllers/users_controller.rb | |
parent | 293e86ee67c190cdd5103234f4aad82b1d456c9a (diff) | |
parent | 9870b0e4a9abee40575aa063fe3c5fda5addf894 (diff) |
Merged pull request #55.
Diffstat (limited to 'app/controllers/users_controller.rb')
-rw-r--r-- | app/controllers/users_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 28bdf7b..61613af 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -149,9 +149,9 @@ class UsersController < ApplicationController def update if (mod? && current_user.role >= @user.role ) || (@user.is?(current_user) && confirmed?) if mod? - userdata = user_params([:name, :skype, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark]) + userdata = user_params([:name, :discord, :youtube, :twitter, :about, :role, :badge, :confirmed, :header_scroll, :utc_time, :dark]) else - userdata = user_params([:name, :skype, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark]) + userdata = user_params([:name, :discord, :youtube, :twitter, :about, :header_scroll, :utc_time, :dark]) end 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." |