Make the username cookie permanent

This commit is contained in:
Tom Hughes 2011-11-16 10:05:39 +00:00
parent 71f377ab8f
commit 7c25a1e1bc

View file

@ -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]