Revert [6430] since the test is faulty. References #7837, closes #7842.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6435 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

3 files changed, 1 insertions, 13 deletions

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 7b0ef65172..ecfebf7e67 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -2,8 +2,6 @@
 
 * Performance: patch cgi/session/pstore to require digest/md5 once rather than per #initialize.  #7583 [Stefan Kaes]
 
-* Undeprecate redirect_to with Hash argument and additional url_for parameters.  #7837 [subelsky]
-
 * Cookie session store: ensure that new sessions doesn't reuse data from a deleted session in the same request.  [Jeremy Kemper]
 
 * Deprecation: verification with :redirect_to => :named_route shouldn't be deprecated.  #7525 [Justin French]
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index d6c7677d55..2f7919cc07 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -1037,7 +1037,7 @@ module ActionController #:nodoc:
               response.redirected_to = options
             else
               # TOOD: Deprecate me!
-              redirect_to(url_for(options))
+              redirect_to(url_for(options, *parameters_for_method_reference))
               response.redirected_to, response.redirected_to_method_params = options, parameters_for_method_reference
             end
         end
diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb
index c4d2ebe5cb..df037ec28d 100755
--- a/actionpack/test/controller/redirect_test.rb
+++ b/actionpack/test/controller/redirect_test.rb
@@ -22,11 +22,6 @@ class RedirectController < ActionController::Base
     redirect_to :back
   end
 
-  def redirect_with_parameters
-    session[:params] = { :user => 'test'}
-    redirect_to session[:params], :acton => 'hello_world'
-  end
-  
   def rescue_errors(e) raise e end
     
   def rescue_action(e) raise end
@@ -102,11 +97,6 @@ class RedirectTest < Test::Unit::TestCase
       get :redirect_to_back
     }
   end
-  
-  def test_redirect_with_parameters
-    get :redirect_with_parameters
-  end
-  
 end
 
 module ModuleTest