X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/846699104d2783d2d9d1162196bd428f0af6334e..9deeae3f9630bb85fc420a9eb09edb6318d32f09:/app/controllers/user_controller.rb?ds=sidebyside

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 3a2bc7f0d..829d918c8 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -67,7 +67,12 @@ class UserController < ApplicationController
           flash.now[:notice] = t 'user.account.flash update success'
         else
           flash.now[:notice] = t 'user.account.flash update success confirm needed'
-          Notifier.deliver_email_confirm(@user, @user.tokens.create)
+
+          begin
+            Notifier.deliver_email_confirm(@user, @user.tokens.create)
+          rescue
+            # Ignore errors sending email
+          end
         end
       end
     else
@@ -157,6 +162,7 @@ class UserController < ApplicationController
       user = User.authenticate(:username => email_or_display_name, :password => pass)
       if user
         session[:user] = user.id
+        session_expires_after 1.month if params[:remember_me]
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
         flash.now[:error] = t 'user.login.account not active'
       else
@@ -192,6 +198,7 @@ class UserController < ApplicationController
       session[:token] = nil
     end
     session[:user] = nil
+    session_expires_automatically
     if params[:referer]
       redirect_to params[:referer]
     else