diff options
| author | José Valim <jose.valim@gmail.com> | 2010-02-17 00:48:04 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-02-17 00:48:04 +0100 |
| commit | 3f948a0e2951a8bb7f32e98a404fb5ff97cb2896 (patch) | |
| tree | 8528d926c137a3a0f18c21642a8b6be1f334b6df /actionpack/lib/action_dispatch/routing/route_set.rb | |
| parent | d4e008fd0f9ebac3383a0c3ac093de68db9e2e66 (diff) | |
| parent | 762088a0ef1f69ab09833732cfe8190098303ee6 (diff) | |
| download | rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.gz rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.tar.bz2 rails-3f948a0e2951a8bb7f32e98a404fb5ff97cb2896.zip | |
Merge master.
Diffstat (limited to 'actionpack/lib/action_dispatch/routing/route_set.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index c3fda0aaef..8778fd2932 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -430,7 +430,7 @@ module ActionDispatch end req = Rack::Request.new(env) - @set.recognize(req) do |route, params| + @set.recognize(req) do |route, matches, params| dispatcher = route.app if dispatcher.is_a?(Dispatcher) && dispatcher.controller(params, false) dispatcher.prepare_params!(params) |