From: Tom Hughes <tom@compton.nu>
Date: Sun, 29 Sep 2013 14:43:34 +0000 (+0100)
Subject: Don't redirect from user#terms to login if the user is logged in
X-Git-Tag: live~4670
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a8d65b8dbf864deedda2eb304b3d21d7f7fc1e0c

Don't redirect from user#terms to login if the user is logged in
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 325d7b3fe..3d97c58f1 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -30,7 +30,7 @@ class UserController < ApplicationController
       if @user and @user.terms_agreed?
         # Already agreed to terms, so just show settings
         redirect_to :action => :account, :display_name => @user.display_name
-      elsif session[:new_user].nil?
+      elsif @user.nil? and session[:new_user].nil?
         redirect_to :action => :login, :referer => request.fullpath
       end
     end