Improve handling of login/logout some more to improve the chances of

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 9a1d89da6222213eef1c55108adcdd77b27e4807..83845af42547fcbd50a0a5182704cbcaaf9bf488 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -99,8 +99,8 @@ class UserController < ApplicationController
         u.timeout = 1.day.from_now
         u.save
         session[:token] = u.token
         u.timeout = 1.day.from_now
         u.save
         session[:token] = u.token

-        if params[:next_controller] and params[:next_action]
-          redirect_to :controller => params[:next_controller], :action => params[:next_action]
+        if params[:referer]
+          redirect_to params[:referer]

         else
           redirect_to :controller => 'site', :action => 'index'
         end
         else
           redirect_to :controller => 'site', :action => 'index'
         end


@@ -121,8 +121,8 @@ class UserController < ApplicationController
       end
     end
     session[:token] = nil
       end
     end
     session[:token] = nil

-    if params[:next_controller] and params[:next_action]
-      redirect_to :controller => params[:next_controller], :action => params[:next_action]
+    if params[:referer]
+      redirect_to params[:referer]

     else
       redirect_to :controller => 'site', :action => 'index'
     end
     else
       redirect_to :controller => 'site', :action => 'index'
     end