diff options
Diffstat (limited to 'actionpack/lib/action_controller/benchmarking.rb')
| -rw-r--r-- | actionpack/lib/action_controller/benchmarking.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/benchmarking.rb b/actionpack/lib/action_controller/benchmarking.rb index 5201d31b8b..6916e60e23 100644 --- a/actionpack/lib/action_controller/benchmarking.rb +++ b/actionpack/lib/action_controller/benchmarking.rb @@ -41,14 +41,14 @@ module ActionController #:nodoc: end protected - def render_with_benchmark(options = nil, deprecated_status = nil, &block) + def render_with_benchmark(options = nil, extra_options = {}, &block) unless logger - render_without_benchmark(options, &block) + render_without_benchmark(options, extra_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, &block) }.real + @rendering_runtime = Benchmark::measure{ render_output = render_without_benchmark(options, extra_options, &block) }.real if Object.const_defined?("ActiveRecord") && ActiveRecord::Base.connected? @db_rt_before_render = db_runtime |