Preserve the referer at the end of account creation

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 25dd18f9223b905493baf91b50b1f5ecfd5568e3..649c0c9078792afc184c4961cbda6a0ef8c77094 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -95,9 +95,9 @@ class UserController < ApplicationController
         flash[:notice] = t 'user.new.flash create success message', :email => @user.email
         Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
         session[:token] = @user.tokens.create.token
         flash[:notice] = t 'user.new.flash create success message', :email => @user.email
         Notifier.deliver_signup_confirm(@user, @user.tokens.create(:referer => params[:referer]))
         session[:token] = @user.tokens.create.token

-        redirect_to :action => 'login'
+        redirect_to :action => 'login', :referer => params[:referer]

       else
       else

-        render :action => 'new'
+        render :action => 'new', :referer => params[:referer]

       end
     end
   end
       end
     end
   end

diff --git a/test/functional/user_controller_test.rb b/test/functional/user_controller_test.rb
index cbe66a0dbee43a1230abd579cdbe97e923419896..1c591f0e63ef733624b15488e9ecdf35abf54ada 100644 (file)
--- a/test/functional/user_controller_test.rb
+++ b/test/functional/user_controller_test.rb
@@ -43,7 +43,7 @@ class UserControllerTest < ActionController::TestCase
     assert_match /#{@url}/, register_email.body
 
     # Check the page
     assert_match /#{@url}/, register_email.body
 
     # Check the page

-    assert_redirected_to :action => 'login'
+    assert_redirected_to :action => 'login', :referer => nil

       
     ActionMailer::Base.deliveries.clear
   end
       
     ActionMailer::Base.deliveries.clear
   end