diff options
| author | Aaron Patterson <tenderlove@github.com> | 2019-02-13 08:27:05 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 08:27:05 -0800 |
| commit | f22c6bbfe5f9bc308216c0e15a4986ae228d6ccf (patch) | |
| tree | dda321ba9d1cbbec6b1396b09016f04544f0c790 /actionview/lib/action_view/rendering.rb | |
| parent | be099cc13f6d0240782d7d63bedd4814ad48fb2d (diff) | |
| parent | 2b6d2d20374130da469ece24842ce3b681d3b788 (diff) | |
| download | rails-f22c6bbfe5f9bc308216c0e15a4986ae228d6ccf.tar.gz rails-f22c6bbfe5f9bc308216c0e15a4986ae228d6ccf.tar.bz2 rails-f22c6bbfe5f9bc308216c0e15a4986ae228d6ccf.zip | |
Merge pull request #35229 from rails/fix-35222
Convert lookup context's to a stack for fixing #35222 and #34138
Diffstat (limited to 'actionview/lib/action_view/rendering.rb')
| -rw-r--r-- | actionview/lib/action_view/rendering.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb index da92ce1f5e..b798e80b04 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -82,7 +82,7 @@ module ActionView # # Override this method in a module to change the default behavior. def view_context - view_context_class.new(view_renderer, view_assigns, self) + view_context_class.new(lookup_context, view_assigns, self) end # Returns an object that is able to render templates. @@ -112,7 +112,7 @@ module ActionView lookup_context.rendered_format = nil if options[:formats] lookup_context.variants = variant if variant - view_renderer.render(context, options) + context.view_renderer.render(context, options) end # Assign the rendered format to look up context. |