diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-23 10:16:03 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-23 10:16:03 -0700 |
commit | 559d89c5b3381f6744b81e45bf423026fcaf4f9d (patch) | |
tree | d681f9b46d48a046592b3fe37c723c0d2b56d24f /actionpack/lib/action_dispatch | |
parent | 890e0a97fb1179fb0acadf3d7146bb786b0c9e0d (diff) | |
download | rails-559d89c5b3381f6744b81e45bf423026fcaf4f9d.tar.gz rails-559d89c5b3381f6744b81e45bf423026fcaf4f9d.tar.bz2 rails-559d89c5b3381f6744b81e45bf423026fcaf4f9d.zip |
find_routes only use the request, so stop passing env
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/journey/router.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb index 26776d2dd8..13850b43cb 100644 --- a/actionpack/lib/action_dispatch/journey/router.rb +++ b/actionpack/lib/action_dispatch/journey/router.rb @@ -34,7 +34,7 @@ module ActionDispatch req.path_info = Utils.normalize_path(req.path_info) - find_routes(env, req).each do |match, parameters, route| + find_routes(req).each do |match, parameters, route| set_params = req.path_parameters path_info = req.path_info script_name = req.script_name @@ -64,7 +64,7 @@ module ActionDispatch def recognize(req) rails_req = request_class.new(req.env) - find_routes(req.env, rails_req).each do |match, parameters, route| + find_routes(rails_req).each do |match, parameters, route| unless route.path.anchored req.env['SCRIPT_NAME'] = match.to_s req.env['PATH_INFO'] = match.post_match.sub(/^([^\/])/, '/\1') @@ -104,7 +104,7 @@ module ActionDispatch simulator.memos(path) { [] } end - def find_routes env, req + def find_routes req routes = filter_routes(req.path_info).concat custom_routes.find_all { |r| r.path.match(req.path_info) } |