diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-02 15:21:19 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-02 15:21:19 -0700 |
commit | 186fee48c796b104b76ef69decb32ef396f435db (patch) | |
tree | 9f8b8c8c83af7bd2913c1283f51fd3c3492fea82 /actionpack/lib/action_controller/dispatch/dispatcher.rb | |
parent | 945bf9c254b5bfb56df874c1a3f7f0f1e89dc8b8 (diff) | |
parent | 24affdc88c4a4af03ce1ec5b23c3def18b90effe (diff) | |
download | rails-186fee48c796b104b76ef69decb32ef396f435db.tar.gz rails-186fee48c796b104b76ef69decb32ef396f435db.tar.bz2 rails-186fee48c796b104b76ef69decb32ef396f435db.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/dispatch/dispatcher.rb')
-rw-r--r-- | actionpack/lib/action_controller/dispatch/dispatcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/dispatch/dispatcher.rb b/actionpack/lib/action_controller/dispatch/dispatcher.rb index bb9d8bd063..25844bf2a2 100644 --- a/actionpack/lib/action_controller/dispatch/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatch/dispatcher.rb @@ -80,7 +80,7 @@ module ActionController Routing::Routes.call(env) rescue Exception => exception if controller ||= (::ApplicationController rescue Base) - controller.call_with_exception(env, exception).to_a + controller.call_with_exception(env, exception) else raise exception end |