diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 14:12:23 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-01-02 14:12:23 -0300 |
| commit | 873870df4cbb0b79d1cb6d811cf68d3aa9fdc625 (patch) | |
| tree | 69ae79f4064b6d5af931b03585540ef4d06a33b5 /actionview/lib/action_view | |
| parent | c455817804e4df64c46c17a0cdec0e5a1ca5ba2e (diff) | |
| parent | f02a35b86efea24f1e2ab684bc8081ced5eb3b1a (diff) | |
| download | rails-873870df4cbb0b79d1cb6d811cf68d3aa9fdc625.tar.gz rails-873870df4cbb0b79d1cb6d811cf68d3aa9fdc625.tar.bz2 rails-873870df4cbb0b79d1cb6d811cf68d3aa9fdc625.zip | |
Merge pull request #17974 from killthekitten/fix-render-block
Make possible to use blocks with short version of render partial
Conflicts:
actionview/CHANGELOG.md
Diffstat (limited to 'actionview/lib/action_view')
| -rw-r--r-- | actionview/lib/action_view/helpers/rendering_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/rendering_helper.rb b/actionview/lib/action_view/helpers/rendering_helper.rb index e11670e00d..827932d8e2 100644 --- a/actionview/lib/action_view/helpers/rendering_helper.rb +++ b/actionview/lib/action_view/helpers/rendering_helper.rb @@ -32,7 +32,7 @@ module ActionView view_renderer.render(self, options) end else - view_renderer.render_partial(self, :partial => options, :locals => locals) + view_renderer.render_partial(self, :partial => options, :locals => locals, &block) end end |