diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-02-12 22:42:36 +0000 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-02-12 22:42:36 +0000 |
| commit | 46356100d1518c67d005be1fecceb9aea4c72dfd (patch) | |
| tree | 3be4b7579fe95c45929d3135ea370493519c8c01 /actionpack/lib/action_controller/benchmarking.rb | |
| parent | 11787b802a1ea8152507e94940f9af394d343c4c (diff) | |
| download | rails-46356100d1518c67d005be1fecceb9aea4c72dfd.tar.gz rails-46356100d1518c67d005be1fecceb9aea4c72dfd.tar.bz2 rails-46356100d1518c67d005be1fecceb9aea4c72dfd.zip | |
Make sure render :update support the options hash. Closes #11088 [ernesto.jimenez]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8862 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
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 |