diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-26 01:29:28 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-09-26 01:29:28 +0000 |
| commit | 1c68394b68507052103fc36406b140f23c348437 (patch) | |
| tree | 4b24fcfeef3a40c51cf7208dee23c8eae724d6f3 /actionpack/lib | |
| parent | f08da31a4fc9624ed2621d156194c7e61261a141 (diff) | |
| download | rails-1c68394b68507052103fc36406b140f23c348437.tar.gz rails-1c68394b68507052103fc36406b140f23c348437.tar.bz2 rails-1c68394b68507052103fc36406b140f23c348437.zip | |
Reinstate the default AR.instantiate_observers to_prepare block.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7641 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb index e06c2ebe36..8c5a73c2f5 100644 --- a/actionpack/lib/action_controller/dispatcher.rb +++ b/actionpack/lib/action_controller/dispatcher.rb @@ -99,6 +99,12 @@ module ActionController after_dispatch :flush_logger after_dispatch :cleanup_application + if defined? ActiveRecord + to_prepare :activerecord_instantiate_observers do + ActiveRecord::Base.instantiate_observers + end + end + def initialize(output, request = nil, response = nil) @output, @request, @response = output, request, response end |