Merge pull request #3631 from AntonKhorev/bootstrap-close

[rails.git] / app / controllers / concerns / user_methods.rb

diff --git a/app/controllers/concerns/user_methods.rb b/app/controllers/concerns/user_methods.rb
index 9099b37c9f5d9c76a8d558f71b0015d3cf9dc60e..81e9f0064c4e7b331b8fc8cc4fdddcb5dbf9073d 100644 (file)
--- a/app/controllers/concerns/user_methods.rb
+++ b/app/controllers/concerns/user_methods.rb
@@ -6,15 +6,15 @@ module UserMethods
   ##
   # update a user's details
   def update_user(user, params)
   ##
   # update a user's details
   def update_user(user, params)

-    user.display_name = params[:user][:display_name]
-    user.new_email = params[:user][:new_email]
+    user.display_name = params[:display_name]
+    user.new_email = params[:new_email]

 
 

-    unless params[:user][:pass_crypt].empty? && params[:user][:pass_crypt_confirmation].empty?
-      user.pass_crypt = params[:user][:pass_crypt]
-      user.pass_crypt_confirmation = params[:user][:pass_crypt_confirmation]
+    unless params[:pass_crypt].empty? && params[:pass_crypt_confirmation].empty?
+      user.pass_crypt = params[:pass_crypt]
+      user.pass_crypt_confirmation = params[:pass_crypt_confirmation]

     end
 
     end
 

-    if params[:user][:auth_provider].nil? || params[:user][:auth_provider].blank?
+    if params[:auth_provider].nil? || params[:auth_provider].blank?

       user.auth_provider = nil
       user.auth_uid = nil
     end
       user.auth_provider = nil
       user.auth_uid = nil
     end