Changeset 1221
- Timestamp:
- 04/19/05 09:54:10 (3 years ago)
- Files:
-
- trunk/actionpack/CHANGELOG (modified) (1 diff)
- trunk/actionpack/lib/action_controller/benchmarking.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/CHANGELOG
r1216 r1221 1 *SVN* 2 3 * Fixed that rendering a template would require a connection to the database #1146 4 5 1 6 *1.8.0* (19th April, 2005) 2 7 trunk/actionpack/lib/action_controller/benchmarking.rb
r1070 r1221 20 20 render_without_benchmark(template_name, status) 21 21 else 22 db_runtime = ActiveRecord::Base.connection.reset_runtime 22 db_runtime = ActiveRecord::Base.connection.reset_runtime if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? 23 23 @rendering_runtime = Benchmark::measure{ render_without_benchmark(template_name, status) }.real 24 24 @db_rt_before_render = db_runtime 25 @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime 25 @db_rt_after_render = ActiveRecord::Base.connection.reset_runtime if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? 26 26 @rendering_runtime -= @db_rt_after_render 27 27 end
