Browse files

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
  • Loading branch information...
1 parent bcff10a commit c593721e7c5749311c5c8e503c3b248194292d6f @jeremy jeremy committed Mar 16, 2007
Showing with 1 addition and 13 deletions.
  1. +0 −2 actionpack/CHANGELOG
  2. +1 −1 actionpack/lib/action_controller/base.rb
  3. +0 −10 actionpack/test/controller/redirect_test.rb
View
2 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]
View
2 actionpack/lib/action_controller/base.rb
@@ -1037,7 +1037,7 @@ def redirect_to(options = {}, *parameters_for_method_reference) #:doc:
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
View
10 actionpack/test/controller/redirect_test.rb
@@ -22,11 +22,6 @@ def redirect_to_back
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 @@ def test_redirect_to_back_with_no_referer
get :redirect_to_back
}
end
-
- def test_redirect_with_parameters
- get :redirect_with_parameters
- end
-
end
module ModuleTest

0 comments on commit c593721

Please sign in to comment.