aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-07-10 19:38:20 -0400
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-07-10 19:38:20 -0400
commit0d676d154547b7c8f1c5ba03c9d2e51c089d7732 (patch)
treeb7fd3b8f210a9a503d2f9791625f63a183597797 /actionpack/lib/action_controller
parent6e76031e8f1f815b390f966cb21e25c66e5ded50 (diff)
parent013c74d645a5842ce35857e4f14af7fc9961c54d (diff)
downloadrails-0d676d154547b7c8f1c5ba03c9d2e51c089d7732.tar.gz
rails-0d676d154547b7c8f1c5ba03c9d2e51c089d7732.tar.bz2
rails-0d676d154547b7c8f1c5ba03c9d2e51c089d7732.zip
Merge pull request #14883 from chancancode/rm-single-space
Removed the single space character for Safari
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/rendering.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/metal/rendering.rb b/actionpack/lib/action_controller/metal/rendering.rb
index 93e7d6954c..7bbff0450a 100644
--- a/actionpack/lib/action_controller/metal/rendering.rb
+++ b/actionpack/lib/action_controller/metal/rendering.rb
@@ -67,8 +67,8 @@ module ActionController
options[:html] = ERB::Util.html_escape(options[:html])
end
- if options.delete(:nothing) || _any_render_format_is_nil?(options)
- options[:body] = " "
+ if options.delete(:nothing)
+ options[:body] = nil
end
if options[:status]
@@ -86,10 +86,6 @@ module ActionController
end
end
- def _any_render_format_is_nil?(options)
- RENDER_FORMATS_IN_PRIORITY.any? { |format| options.key?(format) && options[format].nil? }
- end
-
# Process controller specific options, as status, content-type and location.
def _process_options(options) #:nodoc:
status, content_type, location = options.values_at(:status, :content_type, :location)