diff options
author | José Valim <jose.valim@gmail.com> | 2011-05-03 16:51:08 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2011-05-03 16:51:47 +0200 |
commit | f9849070acb4c7df0b60c61cea3a927191851e92 (patch) | |
tree | 0ac9c778331d7be47c83e1eabafb88c2175718ce /actionpack/lib/action_view/helpers | |
parent | f82767e276b7f6fcd7c0770348cb8f1716365dba (diff) | |
download | rails-f9849070acb4c7df0b60c61cea3a927191851e92.tar.gz rails-f9849070acb4c7df0b60c61cea3a927191851e92.tar.bz2 rails-f9849070acb4c7df0b60c61cea3a927191851e92.zip |
Add a shared entry point for AV and AC render which can be used as extension in the future.
Diffstat (limited to 'actionpack/lib/action_view/helpers')
-rw-r--r-- | actionpack/lib/action_view/helpers/rendering_helper.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/rendering_helper.rb b/actionpack/lib/action_view/helpers/rendering_helper.rb index c91e03b7e8..47efdded42 100644 --- a/actionpack/lib/action_view/helpers/rendering_helper.rb +++ b/actionpack/lib/action_view/helpers/rendering_helper.rb @@ -20,10 +20,8 @@ module ActionView when Hash if block_given? view_renderer.render_partial(self, options.merge(:partial => options[:layout]), &block) - elsif options.key?(:partial) - view_renderer.render_partial(self, options) else - view_renderer.render_template(self, options) + view_renderer.render(self, options) end else view_renderer.render_partial(self, :partial => options, :locals => locals) |