X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/5bc3054d61559107868dfa351b25d8f48c571151..32554955205b000f346e4c6915b571fc5af6a4ed:/app/controllers/user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 510471555..07b4f5975 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -23,9 +23,7 @@ class UserController < ApplicationController
     @text = OSM.legal_text_for_country(@legale)
 
     if request.xhr?
-      render :update do |page|
-        page.replace_html "contributorTerms", :partial => "terms"
-      end
+      render :partial => "terms"
     elsif using_open_id?
       # The redirect from the OpenID provider reenters here
       # again and we need to pass the parameters through to
@@ -336,7 +334,7 @@ class UserController < ApplicationController
             token.destroy
 
             session[:user] = user.id
-            cookies["_osm_username"] = user.display_name
+            cookies.permanent["_osm_username"] = user.display_name
 
             if referer.nil?
               flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
@@ -389,7 +387,7 @@ class UserController < ApplicationController
         end
         token.destroy
         session[:user] = @user.id
-        cookies["_osm_username"] = @user.display_name
+        cookies.permanent["_osm_username"] = @user.display_name
         redirect_to :action => 'account', :display_name => @user.display_name
       else
         flash[:error] = t 'user.confirm_email.failure'
@@ -617,7 +615,7 @@ private
   ##
   # process a successful login
   def successful_login(user)
-    cookies["_osm_username"] = user.display_name
+    cookies.permanent["_osm_username"] = user.display_name
 
     session[:user] = user.id
     session_expires_after 1.month if session[:remember_me]