Use normal assignment instead of mass assignment

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 5c11a5c75b3cdea41dd0a37a9926cf70d4179473..b56b58433c9a8ba870a6ed800a9758a596457c08 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -473,7 +473,7 @@ class UserController < ApplicationController
   ##
   # sets a user's status
   def set_status
-    @this_user.update_attributes(:status => params[:status])
+    @this_user.status => params[:status]
     redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
   end
 
@@ -663,6 +663,8 @@ private
     if user.save
       set_locale
 
+      cookies.permanent["_osm_username"] = user.display_name
+
       if user.new_email.blank?
         flash.now[:notice] = t 'user.account.flash update success'
       else