From 1e5962a1ca7fc1fbbef38892c405350b441a3ae7 Mon Sep 17 00:00:00 2001 From: cktricky Date: Fri, 10 Jul 2015 17:52:37 -0400 Subject: [PATCH] Revert "not sure why this was removed in the first place" This reverts commit b89f520a7dabc5139a8d0e013177e10e6bb471fe. --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index bcea95b..5d812df 100755 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -32,7 +32,7 @@ class UsersController < ApplicationController #user = User.find(:first, :conditions => ["user_id = ?", "#{params[:user][:user_id]}"]) # user = User.find(:first, :conditions => "user_id = '#{params[:user][:user_id]}'") - user = User.find(:first, :conditions => "user_id = '#{params[:user][:user_id]}'") + user = User.where("user_id = '#{params[:user][:user_id]}'").first if user user.skip_user_id_assign = true user.skip_hash_password = true