diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-06 18:25:01 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2004-12-06 18:25:01 +0000 |
| commit | 0ffb6c16258b5c39a7417f4563edf0fc7542c9ae (patch) | |
| tree | 2242cb28635f99410268f48d0415e97b4c5a5de1 /actionpack/lib/action_controller.rb | |
| parent | ed14042feac6ff84670958fc3e2017aaacac5856 (diff) | |
| download | rails-0ffb6c16258b5c39a7417f4563edf0fc7542c9ae.tar.gz rails-0ffb6c16258b5c39a7417f4563edf0fc7542c9ae.tar.bz2 rails-0ffb6c16258b5c39a7417f4563edf0fc7542c9ae.zip | |
Syntax errors and other exceptions thrown outside of an action are now gracefully handled by the dispatcher
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@51 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller.rb')
| -rwxr-xr-x | actionpack/lib/action_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb index af33d5fcff..8bfa6bd907 100755 --- a/actionpack/lib/action_controller.rb +++ b/actionpack/lib/action_controller.rb @@ -32,9 +32,9 @@ require 'action_controller/benchmarking' require 'action_controller/filters' require 'action_controller/layout' require 'action_controller/flash' +require 'action_controller/dependencies' require 'action_controller/scaffolding' require 'action_controller/helpers' -require 'action_controller/dependencies' require 'action_controller/cookies' require 'action_controller/cgi_process' @@ -44,9 +44,9 @@ ActionController::Base.class_eval do include ActionController::Flash include ActionController::Benchmarking include ActionController::Rescue + include ActionController::Dependencies include ActionController::Scaffolding include ActionController::Helpers - include ActionController::Dependencies include ActionController::Cookies end |