From b5571b3ccfbbfae7fea49c7934bb0348acceeeb4 Mon Sep 17 00:00:00 2001 From: Godfrey Chan Date: Fri, 26 Sep 2014 00:07:07 +0900 Subject: Revert "Revert "Merge pull request #16888 from jejacks0n/render_template"" This reverts commit 585e75696b31395aee895e5366e331c07c3f5ee1. --- actionview/lib/action_view/rendering.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'actionview/lib') diff --git a/actionview/lib/action_view/rendering.rb b/actionview/lib/action_view/rendering.rb index 81d5836a8c..5cbdfdf6c0 100644 --- a/actionview/lib/action_view/rendering.rb +++ b/actionview/lib/action_view/rendering.rb @@ -108,7 +108,7 @@ module ActionView end # Normalize args by converting render "foo" to render :action => "foo" and - # render "foo/bar" to render :file => "foo/bar". + # render "foo/bar" to render :template => "foo/bar". # :api: private def _normalize_args(action=nil, options={}) options = super(action, options) @@ -118,7 +118,7 @@ module ActionView options = action when String, Symbol action = action.to_s - key = action.include?(?/) ? :file : :action + key = action.include?(?/) ? :template : :action options[key] = action else options[:partial] = action -- cgit v1.2.3