diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-15 14:45:18 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-15 15:57:33 +0100 |
| commit | e5a2a9fced3e5559ac139977922a0f63a53c6c5c (patch) | |
| tree | a0de1faec1f5e12e6f7ea2fd7e70bdecacde9a2d /actionpack/lib/action_view/render/rendering.rb | |
| parent | 4598d8874948268e1162c1ef75d0bd565b1e0e64 (diff) | |
| download | rails-e5a2a9fced3e5559ac139977922a0f63a53c6c5c.tar.gz rails-e5a2a9fced3e5559ac139977922a0f63a53c6c5c.tar.bz2 rails-e5a2a9fced3e5559ac139977922a0f63a53c6c5c.zip | |
Remove URI object from ActiveResource notification, send the :mailer class in AM (like in AP#process_action) and remove locale instrumentation.
Diffstat (limited to 'actionpack/lib/action_view/render/rendering.rb')
| -rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index d2f28f7e38..ec278ca783 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -109,10 +109,7 @@ module ActionView end def _render_layout(layout, locals, &block) - ActiveSupport::Notifications.instrument("action_view.render_layout", - :identifier => layout.identifier) do - layout.render(self, locals){ |*name| _layout_for(*name, &block) } - end + layout.render(self, locals){ |*name| _layout_for(*name, &block) } end end end |