X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/5bc3054d61559107868dfa351b25d8f48c571151..3266d0bd03d9dd4a018b87a48f893ab19bd250dc:/app/controllers/user_controller.rb?ds=sidebyside
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') + "
" + 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]