diff options
author | Aaron Patterson <tenderlove@github.com> | 2019-03-15 14:18:22 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-03-15 14:18:22 -0700 |
commit | 905018fc184d0f00cbc5c54911d473d705acb1eb (patch) | |
tree | df5991035fa4d6756723f90d4a26bf0cba4cd066 /actionview/lib | |
parent | 1cdc6c6576afe9a9fa67a6b313080a7dc62188d9 (diff) | |
parent | 47fea39ed6b01b0f8c440f94e694519ec677ae4c (diff) | |
download | rails-905018fc184d0f00cbc5c54911d473d705acb1eb.tar.gz rails-905018fc184d0f00cbc5c54911d473d705acb1eb.tar.bz2 rails-905018fc184d0f00cbc5c54911d473d705acb1eb.zip |
Merge pull request #35627 from Futurelearn/seb-rename-view-run-method
Rename `ActionView::Base#run`
Diffstat (limited to 'actionview/lib')
-rw-r--r-- | actionview/lib/action_view/base.rb | 2 | ||||
-rw-r--r-- | actionview/lib/action_view/template.rb | 2 | ||||
-rw-r--r-- | actionview/lib/action_view/template/handlers/erb/erubi.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionview/lib/action_view/base.rb b/actionview/lib/action_view/base.rb index cf71b4803b..5253ef7b0c 100644 --- a/actionview/lib/action_view/base.rb +++ b/actionview/lib/action_view/base.rb @@ -267,7 +267,7 @@ module ActionView #:nodoc: _prepare_context end - def run(method, template, locals, buffer, &block) + def _run(method, template, locals, buffer, &block) _old_output_buffer, _old_virtual_path, _old_template = @output_buffer, @virtual_path, @current_template @current_template = template @output_buffer = buffer diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb index 2c27e11b9e..a3e0be27bc 100644 --- a/actionview/lib/action_view/template.rb +++ b/actionview/lib/action_view/template.rb @@ -173,7 +173,7 @@ module ActionView def render(view, locals, buffer = ActionView::OutputBuffer.new, &block) instrument_render_template do compile!(view) - view.run(method_name, self, locals, buffer, &block) + view._run(method_name, self, locals, buffer, &block) end rescue => e handle_render_error(view, e) diff --git a/actionview/lib/action_view/template/handlers/erb/erubi.rb b/actionview/lib/action_view/template/handlers/erb/erubi.rb index 247b6d75d1..307b852440 100644 --- a/actionview/lib/action_view/template/handlers/erb/erubi.rb +++ b/actionview/lib/action_view/template/handlers/erb/erubi.rb @@ -27,7 +27,7 @@ module ActionView include action_view_erb_handler_context._routes.url_helpers class_eval("define_method(:_template) { |local_assigns, output_buffer| #{src} }", @filename || "(erubi)", 0) }.empty - view.run(:_template, nil, {}, ActionView::OutputBuffer.new) + view._run(:_template, nil, {}, ActionView::OutputBuffer.new) end private |