diff options
| author | José Valim <jose.valim@gmail.com> | 2010-07-25 20:59:37 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-25 20:59:37 +0200 |
| commit | 304c49b1468ce71beb7e3ea0ca4c5add73a1534e (patch) | |
| tree | 459d52879fe866fe5321a730919a2ac6b7c55805 /activerecord/lib/active_record/railties | |
| parent | ff0d842454571d78addd1fe9d4f232b600881b1a (diff) | |
| download | rails-304c49b1468ce71beb7e3ea0ca4c5add73a1534e.tar.gz rails-304c49b1468ce71beb7e3ea0ca4c5add73a1534e.tar.bz2 rails-304c49b1468ce71beb7e3ea0ca4c5add73a1534e.zip | |
Move runtime back to connection.
Diffstat (limited to 'activerecord/lib/active_record/railties')
| -rw-r--r-- | activerecord/lib/active_record/railties/controller_runtime.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/lib/active_record/railties/controller_runtime.rb b/activerecord/lib/active_record/railties/controller_runtime.rb index bc6ca936c0..aed1c59b00 100644 --- a/activerecord/lib/active_record/railties/controller_runtime.rb +++ b/activerecord/lib/active_record/railties/controller_runtime.rb @@ -11,9 +11,9 @@ module ActiveRecord def cleanup_view_runtime if ActiveRecord::Base.connected? - db_rt_before_render = ActiveRecord::LogSubscriber.reset_runtime + db_rt_before_render = ActiveRecord::Base.connection.reset_runtime runtime = super - db_rt_after_render = ActiveRecord::LogSubscriber.reset_runtime + db_rt_after_render = ActiveRecord::Base.connection.reset_runtime self.db_runtime = db_rt_before_render + db_rt_after_render runtime - db_rt_after_render else |