diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-13 15:35:20 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2019-02-19 13:46:09 -0800 |
| commit | 3077cdf921fed35c1e743db5911d7e4b589a684e (patch) | |
| tree | 07e6f8cfd6cbdb7990b833c2f49ca7037350ece7 /actionview/lib/action_view | |
| parent | ff6b713f5e729859995f204093ad3f8e08f39ea8 (diff) | |
| download | rails-3077cdf921fed35c1e743db5911d7e4b589a684e.tar.gz rails-3077cdf921fed35c1e743db5911d7e4b589a684e.tar.bz2 rails-3077cdf921fed35c1e743db5911d7e4b589a684e.zip | |
rename push / pop function
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/base.rb | 2 | ||||
| -rw-r--r-- | actionview/lib/action_view/helpers/rendering_helper.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb index 556a5ee502..be2a662adc 100644 --- a/actionview/lib/action_view/base.rb +++ b/actionview/lib/action_view/base.rb @@ -286,7 +286,7 @@ module ActionView #:nodoc: self.class end - def in_context(options, locals) + def in_rendering_context(options) old_view_renderer = @view_renderer old_lookup_context = @lookup_context diff --git a/actionview/lib/action_view/helpers/rendering_helper.rb b/actionview/lib/action_view/helpers/rendering_helper.rb index 7323963c72..7ead691113 100644 --- a/actionview/lib/action_view/helpers/rendering_helper.rb +++ b/actionview/lib/action_view/helpers/rendering_helper.rb @@ -27,7 +27,7 @@ module ActionView def render(options = {}, locals = {}, &block) case options when Hash - in_context(options, locals) do |renderer| + in_rendering_context(options) do |renderer| if block_given? view_renderer.render_partial(self, options.merge(partial: options[:layout]), &block) else |