aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2010-06-28 02:06:03 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2010-06-28 14:46:23 -0700
commitb3318bd937a238ad2def93cb3bfa5b572f80a8a8 (patch)
tree69815e53db80d44aaeef879ec6f00d476d71787b /actionpack/lib
parent2c4f8aae5ca8489bb3e47712f50b3f57015811d9 (diff)
downloadrails-b3318bd937a238ad2def93cb3bfa5b572f80a8a8.tar.gz
rails-b3318bd937a238ad2def93cb3bfa5b572f80a8a8.tar.bz2
rails-b3318bd937a238ad2def93cb3bfa5b572f80a8a8.zip
Slice new buffer from beginning of old buffer to skip encoding special case
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_view/helpers/capture_helper.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index ea1bf14c96..f9105ca364 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -178,9 +178,7 @@ module ActionView
def flush_output_buffer #:nodoc:
if output_buffer && !output_buffer.empty?
response.body_parts << output_buffer
- new = ''
- new.force_encoding(output_buffer.encoding) if new.respond_to?(:force_encoding)
- self.output_buffer = new
+ self.output_buffer = output_buffer[0,0]
nil
end
end