aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/abstract/renderer.rb
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-04-29 17:32:39 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-05-01 17:31:02 -0700
commit49834e088bf8d02a4f75793a42868f2aea8749a4 (patch)
tree314643bcdaabd64780f027756ca4710c6a2d72ac /actionpack/lib/action_controller/abstract/renderer.rb
parent0c3d9bc4c2b329cb754bfed1e465f99d058e1193 (diff)
downloadrails-49834e088bf8d02a4f75793a42868f2aea8749a4.tar.gz
rails-49834e088bf8d02a4f75793a42868f2aea8749a4.tar.bz2
rails-49834e088bf8d02a4f75793a42868f2aea8749a4.zip
Support implicit render and blank render
Diffstat (limited to 'actionpack/lib/action_controller/abstract/renderer.rb')
-rw-r--r--actionpack/lib/action_controller/abstract/renderer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/abstract/renderer.rb b/actionpack/lib/action_controller/abstract/renderer.rb
index e9a7ab4004..716b213c75 100644
--- a/actionpack/lib/action_controller/abstract/renderer.rb
+++ b/actionpack/lib/action_controller/abstract/renderer.rb
@@ -42,9 +42,9 @@ module AbstractController
def render_to_body(options = {})
name = options[:_template_name] || action_name
- template = options[:_template] || view_paths.find_by_parts(name.to_s, {:formats => formats}, options[:_prefix])
+ options[:_template] ||= view_paths.find_by_parts(name.to_s, {:formats => formats}, options[:_prefix])
- _render_template(template, options)
+ _render_template(options[:_template], options)
end
# Raw rendering of a template to a string.