diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-21 16:12:49 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-21 16:12:49 -0700 |
| commit | dd1f23df7b59a6d0c4cba9c22292032414a7adfe (patch) | |
| tree | 39cfc94ed1038adf9bb554737519ef6e7c1189b0 /actionpack/lib/action_dispatch | |
| parent | c5d64b2b86aa42f57881091491ee289b3c489c7e (diff) | |
| download | rails-dd1f23df7b59a6d0c4cba9c22292032414a7adfe.tar.gz rails-dd1f23df7b59a6d0c4cba9c22292032414a7adfe.tar.bz2 rails-dd1f23df7b59a6d0c4cba9c22292032414a7adfe.zip | |
middle variable is never used, so rm
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/journey/router.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb index 36561c71a1..7c614004d5 100644 --- a/actionpack/lib/action_dispatch/journey/router.rb +++ b/actionpack/lib/action_dispatch/journey/router.rb @@ -90,7 +90,7 @@ module ActionDispatch req.env['PATH_INFO'] = match.post_match.sub(/^([^\/])/, '/\1') end - yield(route, nil, parameters) + yield(route, parameters) end end diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 49e6890b74..8c2e821573 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -699,7 +699,7 @@ module ActionDispatch end req = @request_class.new(env) - @router.recognize(req) do |route, _matches, params| + @router.recognize(req) do |route, params| params.merge!(extras) params.each do |key, value| if value.is_a?(String) |