diff options
| author | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2015-03-01 16:20:27 +0900 |
|---|---|---|
| committer | yuuji.yaginuma <yuuji.yaginuma@gmail.com> | 2015-03-01 16:20:27 +0900 |
| commit | 35d12ef3f15184c45b51bfab9b399fe73a7a3ce3 (patch) | |
| tree | db1e62352dd05bcb56f36a61699e7f06d14aa2bf /actionview/lib | |
| parent | 22e0a22d5f98e162290d9820891d8191e720ad3b (diff) | |
| download | rails-35d12ef3f15184c45b51bfab9b399fe73a7a3ce3.tar.gz rails-35d12ef3f15184c45b51bfab9b399fe73a7a3ce3.tar.bz2 rails-35d12ef3f15184c45b51bfab9b399fe73a7a3ce3.zip | |
fix ActionView::Template::Error when using Streaming with capture.
can't acquire a encoding from StreamingBuffer. fixes #12001
Diffstat (limited to 'actionview/lib')
| -rw-r--r-- | actionview/lib/action_view/helpers/capture_helper.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionview/lib/action_view/helpers/capture_helper.rb b/actionview/lib/action_view/helpers/capture_helper.rb index 5a3223968f..a67ba580f1 100644 --- a/actionview/lib/action_view/helpers/capture_helper.rb +++ b/actionview/lib/action_view/helpers/capture_helper.rb @@ -195,7 +195,9 @@ module ActionView def with_output_buffer(buf = nil) #:nodoc: unless buf buf = ActionView::OutputBuffer.new - buf.force_encoding(output_buffer.encoding) if output_buffer + if output_buffer && output_buffer.respond_to?(:encoding) + buf.force_encoding(output_buffer.encoding) + end end self.output_buffer, old_buffer = buf, output_buffer yield |