diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-20 14:21:27 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-20 15:02:13 +0100 |
| commit | 8e2fd54b19656a6edbd94f8707927d09e167e7fc (patch) | |
| tree | c000b4aa817f677d8160a13e630a2536e76264d0 /actionpack/lib/action_controller/metal/instrumentation.rb | |
| parent | 8b9bfbe225a59ccefa46f1e8bf301bc483bef0e0 (diff) | |
| download | rails-8e2fd54b19656a6edbd94f8707927d09e167e7fc.tar.gz rails-8e2fd54b19656a6edbd94f8707927d09e167e7fc.tar.bz2 rails-8e2fd54b19656a6edbd94f8707927d09e167e7fc.zip | |
Bring normalize behavior to AbstractController::Rendering
Diffstat (limited to 'actionpack/lib/action_controller/metal/instrumentation.rb')
| -rw-r--r-- | actionpack/lib/action_controller/metal/instrumentation.rb | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/actionpack/lib/action_controller/metal/instrumentation.rb b/actionpack/lib/action_controller/metal/instrumentation.rb index 7b2b037c67..19c962bafa 100644 --- a/actionpack/lib/action_controller/metal/instrumentation.rb +++ b/actionpack/lib/action_controller/metal/instrumentation.rb @@ -32,18 +32,12 @@ module ActionController end end - def render(*args, &block) - if logger - render_output = nil - - self.view_runtime = cleanup_view_runtime do - Benchmark.ms { render_output = super } - end - - render_output - else - super + def render(*args) + render_output = nil + self.view_runtime = cleanup_view_runtime do + Benchmark.ms { render_output = super } end + render_output end def send_file(path, options={}) |