diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-21 20:22:18 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-21 20:27:24 -0700 |
commit | 4c52ba278b8e349bc18cb89086af765d0828f0af (patch) | |
tree | 5b06e9a44f696f009c350281891062643620e00c /actionpack/lib/action_controller/new_base/renderer.rb | |
parent | 8f3cbb477375071cfa2ca9b3b01d8a4e3034ccf5 (diff) | |
download | rails-4c52ba278b8e349bc18cb89086af765d0828f0af.tar.gz rails-4c52ba278b8e349bc18cb89086af765d0828f0af.tar.bz2 rails-4c52ba278b8e349bc18cb89086af765d0828f0af.zip |
Move Safari response-padding fix to Rails2Compatibility. Should be a Rack concern.
Diffstat (limited to 'actionpack/lib/action_controller/new_base/renderer.rb')
-rw-r--r-- | actionpack/lib/action_controller/new_base/renderer.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/actionpack/lib/action_controller/new_base/renderer.rb b/actionpack/lib/action_controller/new_base/renderer.rb index 71b79fbc42..59df3c51da 100644 --- a/actionpack/lib/action_controller/new_base/renderer.rb +++ b/actionpack/lib/action_controller/new_base/renderer.rb @@ -28,7 +28,7 @@ module ActionController _process_options(options) if options.key?(:text) - options[:_template] = ActionView::TextTemplate.new(_text(options), formats.first) + options[:_template] = ActionView::TextTemplate.new(options[:text], formats.first) elsif options.key?(:inline) handler = ActionView::Template.handler_class_for_extension(options[:type] || "erb") template = ActionView::Template.new(options[:inline], "inline #{options[:inline].inspect}", handler, {}) @@ -51,17 +51,8 @@ module ActionController def _prefix controller_path - end - - def _text(options) - text = options[:text] - - case text - when nil then " " - else text.to_s - end end - + def _render_partial(partial, options) case partial when true |