Avoid singleton serialisation errors

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 6f2894e3da454764dbc673241500a947dc17b12e..7a0fa5f272d324fed0730b5aec107df09a4f1d4a 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -26,13 +26,12 @@ class UserController < ApplicationController
       render :partial => "terms"
     else
       @title = t 'user.terms.title'
-      @user ||= session[:new_user]
 
-      if !@user
-        redirect_to :action => :login, :referer => request.fullpath
-      elsif @user.terms_agreed?
+      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?
+        redirect_to :action => :login, :referer => request.fullpath
       end
     end
   end