diff options
| author | Godfrey Chan <godfreykfc@gmail.com> | 2014-09-26 00:07:07 +0900 |
|---|---|---|
| committer | Godfrey Chan <godfreykfc@gmail.com> | 2014-09-26 01:42:18 +0900 |
| commit | b5571b3ccfbbfae7fea49c7934bb0348acceeeb4 (patch) | |
| tree | dab869b1fef21206a34ebe364e7e9ba6fc6b52de /actionview/lib/action_view/rendering.rb | |
| parent | b008e4bd8a77e37e22af71dd7ec31fe17abf12e2 (diff) | |
| download | rails-b5571b3ccfbbfae7fea49c7934bb0348acceeeb4.tar.gz rails-b5571b3ccfbbfae7fea49c7934bb0348acceeeb4.tar.bz2 rails-b5571b3ccfbbfae7fea49c7934bb0348acceeeb4.zip | |
Revert "Revert "Merge pull request #16888 from jejacks0n/render_template""
This reverts commit 585e75696b31395aee895e5366e331c07c3f5ee1.
Diffstat (limited to 'actionview/lib/action_view/rendering.rb')
| -rw-r--r-- | actionview/lib/action_view/rendering.rb | 4 |
1 files changed, 2 insertions, 2 deletions
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 |