diff options
| author | Michael Koziarski <michael@koziarski.com> | 2007-09-03 00:18:30 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2007-09-03 00:18:30 +0000 |
| commit | f81dae3fca46c43d1fb6e4cb40734ef35623a72e (patch) | |
| tree | 987017ae80580ee8f39c877a8f91c8b42eae14c5 /actionpack/lib/action_controller/benchmarking.rb | |
| parent | 6246fad19a5ec747f5914c142b8631af212d47ea (diff) | |
| download | rails-f81dae3fca46c43d1fb6e4cb40734ef35623a72e.tar.gz rails-f81dae3fca46c43d1fb6e4cb40734ef35623a72e.tar.bz2 rails-f81dae3fca46c43d1fb6e4cb40734ef35623a72e.zip | |
Remove deprecated functionality from actionpack. Closes #8958 [lifofifo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7403 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/benchmarking.rb')
| -rw-r--r-- | actionpack/lib/action_controller/benchmarking.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb index 8e0d83c2d6..31fa5d940d 100644 --- a/actionpack/lib/action_controller/benchmarking.rb +++ b/actionpack/lib/action_controller/benchmarking.rb @@ -43,12 +43,12 @@ module ActionController #:nodoc: protected def render_with_benchmark(options = nil, deprecated_status = nil, &block) unless logger - render_without_benchmark(options, deprecated_status, &block) + render_without_benchmark(options, &block) else db_runtime = ActiveRecord::Base.connection.reset_runtime if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? render_output = nil - @rendering_runtime = Benchmark::measure{ render_output = render_without_benchmark(options, deprecated_status, &block) }.real + @rendering_runtime = Benchmark::measure{ render_output = render_without_benchmark(options, &block) }.real if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? @db_rt_before_render = db_runtime |