aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index d0095caa75..c4b7b4f5ee 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -11,12 +11,10 @@ module ActionController
def render(*args, &block)
super(*args, &block)
opts = args.first
- if (opts.keys & [:text, :nothing]).present?
- self.response_body = if opts.has_key?(:text) && opts[:text].present?
- opts[:text]
- elsif opts.has_key?(:nothing) && opts[:nothing]
- " "
- end
+ if opts.has_key?(:text) && opts[:text].present?
+ self.response_body = opts[:text]
+ elsif opts.has_key?(:nothing) && opts[:nothing]
+ self.response_body = " "
else
raise UnsupportedOperationError
end