diff options
Diffstat (limited to 'actionpack/lib')
| -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)  | 
