aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/rendering.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@plataformatec.com.br>2013-09-09 12:05:09 -0300
committerJosé Valim <jose.valim@plataformatec.com.br>2013-09-09 12:33:53 -0300
commita41669563b960d604068013a5b808476391b1cb9 (patch)
tree7dc3d804f06d05de471e34ef8ff3e63618fe2d3e /actionpack/lib/action_controller/metal/rendering.rb
parentff8fac614f04f9cc7bc4ce78f3b9a758814cd0ab (diff)
downloadrails-a41669563b960d604068013a5b808476391b1cb9.tar.gz
rails-a41669563b960d604068013a5b808476391b1cb9.tar.bz2
rails-a41669563b960d604068013a5b808476391b1cb9.zip
Remove BasicRendering and remove template functionality from AbsC::Rendering
Diffstat (limited to 'actionpack/lib/action_controller/metal/rendering.rb')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 7b4f1f73a5..37dee1738f 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -28,8 +28,12 @@ module ActionController
end
end
- def render_to_body(*)
- super || " "
+ def render_to_body(options = {})
+ super || if options[:text].present?
+ options[:text]
+ else
+ " "
+ end
end
private