small bug fix (#1174)

if someone besides one of "us" tried to change their password, and their settings, it wouldn't work

in the typical case it would work fine
This commit is contained in:
Connor Turland 2018-03-12 00:57:23 -04:00 committed by Devin Howard
parent bd7bf20810
commit 38a209a970

View file

@ -42,7 +42,7 @@ class UsersController < ApplicationController
correct_pass = @user.valid_password?(params[:current_password]) correct_pass = @user.valid_password?(params[:current_password])
if correct_pass && @user.update_attributes(user_params) if correct_pass && @user.update_attributes(user_params)
update_follow_settings(@user, params[:settings]) if is_tester(@user) update_follow_settings(@user, params[:settings])
@user.image = nil if params[:remove_image] == '1' @user.image = nil if params[:remove_image] == '1'
@user.save @user.save
sign_in(@user, bypass: true) sign_in(@user, bypass: true)