aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-04-04 13:00:22 -0700
committerwycats <wycats@gmail.com>2010-04-04 13:17:14 -0700
commitb546945b51d1e5765b4bf4eba0bd8413ea8e4198 (patch)
treeb559e3f02b41c622be48b6af8801577ffaaa2e93 /actionpack/lib
parent50cdb654ac4ff1bde2f432d205932a6887f6f92f (diff)
downloadrails-b546945b51d1e5765b4bf4eba0bd8413ea8e4198.tar.gz
rails-b546945b51d1e5765b4bf4eba0bd8413ea8e4198.tar.bz2
rails-b546945b51d1e5765b4bf4eba0bd8413ea8e4198.zip
Reapply redirect {|params, request| } with passing tests this time
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/routing/mapper.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb
index ffa178345b..925e91f081 100644
--- a/actionpack/lib/action_dispatch/routing/mapper.rb
+++ b/actionpack/lib/action_dispatch/routing/mapper.rb
@@ -243,7 +243,11 @@ module ActionDispatch
lambda do |env|
req = Request.new(env)
- uri = URI.parse(path_proc.call(req.symbolized_path_parameters))
+
+ params = [req.symbolized_path_parameters]
+ params << req if path_proc.arity > 1
+
+ uri = URI.parse(path_proc.call(*params))
uri.scheme ||= req.scheme
uri.host ||= req.host
uri.port ||= req.port unless req.port == 80