aboutsummaryrefslogtreecommitdiffstats
path: root/actionview/lib/action_view/rendering.rb
diff options
context:
space:
mode:
authorjejacks0n <jejacks0n@gmail.com>2014-09-11 21:54:49 -0600
committerjejacks0n <jejacks0n@gmail.com>2014-09-11 21:54:49 -0600
commit428722ba4fafe1ed9ede64afb4478750637aa410 (patch)
treef6e37e424537f1f6612038bb5d63aac0d9432a74 /actionview/lib/action_view/rendering.rb
parent516f431ab0618a052f53eb5b14e2c6204da244dd (diff)
downloadrails-428722ba4fafe1ed9ede64afb4478750637aa410.tar.gz
rails-428722ba4fafe1ed9ede64afb4478750637aa410.tar.bz2
rails-428722ba4fafe1ed9ede64afb4478750637aa410.zip
Changes default render behavior from file to template.
Diffstat (limited to 'actionview/lib/action_view/rendering.rb')
-rw-r--r--actionview/lib/action_view/rendering.rb4
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