diff options
| author | Carlhuda <carlhuda@engineyard.com> | 2010-03-17 16:28:05 -0700 |
|---|---|---|
| committer | Carlhuda <carlhuda@engineyard.com> | 2010-03-17 16:29:35 -0700 |
| commit | d9375f3f302a5d1856ad57946c7263d4e6a45a2a (patch) | |
| tree | 76769a45da7b1315df173976067ff37edcb59b49 /actionpack/lib/action_view/render | |
| parent | 7872fa9a4397c450ee22c511966e149d594d153e (diff) | |
| download | rails-d9375f3f302a5d1856ad57946c7263d4e6a45a2a.tar.gz rails-d9375f3f302a5d1856ad57946c7263d4e6a45a2a.tar.bz2 rails-d9375f3f302a5d1856ad57946c7263d4e6a45a2a.zip | |
Modify assert_template to use notifications. Also, remove ActionController::Base#template since it is no longer needed.
Diffstat (limited to 'actionpack/lib/action_view/render')
| -rw-r--r-- | actionpack/lib/action_view/render/rendering.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/render/rendering.rb b/actionpack/lib/action_view/render/rendering.rb index d8dfd5077b..b0fed556c3 100644 --- a/actionpack/lib/action_view/render/rendering.rb +++ b/actionpack/lib/action_view/render/rendering.rb @@ -53,13 +53,12 @@ module ActionView layout = find_layout(layout) if layout ActiveSupport::Notifications.instrument("action_view.render_template", - :identifier => template.identifier, :layout => layout.try(:identifier)) do + :identifier => template.identifier, :layout => layout.try(:virtual_path)) do content = template.render(self, locals) { |*name| _layout_for(*name) } @_content_for[:layout] = content if layout - @_layout = layout.identifier content = _render_layout(layout, locals) end |