diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-05-04 19:23:34 -0300 |
| commit | d3042ef80c4406c90ff1e120059a99784d8ae79f (patch) | |
| tree | a779b4fced3fd546d7c7c855fee41f3d996afba0 /actionpack/lib/action_controller/routing | |
| parent | d522b7ccf61a71b4c66ddf39368513d1fd9cd577 (diff) | |
| parent | eb201e64c0b68aee6d0715d44cf48178204c4133 (diff) | |
| download | rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.gz rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.tar.bz2 rails-d3042ef80c4406c90ff1e120059a99784d8ae79f.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/routing')
| -rw-r--r-- | actionpack/lib/action_controller/routing/route_set.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing/route_set.rb b/actionpack/lib/action_controller/routing/route_set.rb index 70cd1f642d..172b867bf0 100644 --- a/actionpack/lib/action_controller/routing/route_set.rb +++ b/actionpack/lib/action_controller/routing/route_set.rb @@ -430,7 +430,7 @@ module ActionController def call(env) request = ActionDispatch::Request.new(env) app = Routing::Routes.recognize(request) - app.call(env).to_a + app.call(env) end def recognize(request) |