From: Tom Hughes <tom@compton.nu>
Date: Wed, 16 Nov 2011 10:05:39 +0000 (+0000)
Subject: Make the username cookie permanent
X-Git-Tag: live~6007
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7c25a1e1bc05af8110fd2d81a6db208b01a0eacb?hp=71f377ab8f915e9cb73252aeb03ca2fa8e32e753

Make the username cookie permanent
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 510471555..de07e4b53 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -336,7 +336,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 +389,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 +617,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]