diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-07-23 13:50:34 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2011-10-13 13:36:20 -0700 |
| commit | 8f11d53506ea7ef2fd4cd28581f5eedd9be9e570 (patch) | |
| tree | d6cbe4ff8a077cb0d2b75a4e7add7422b313c9cc /actionpack/lib/action_view | |
| parent | 74fbbf1ea0018042e8709b8ad13c44718da3fdc1 (diff) | |
| download | rails-8f11d53506ea7ef2fd4cd28581f5eedd9be9e570.tar.gz rails-8f11d53506ea7ef2fd4cd28581f5eedd9be9e570.tar.bz2 rails-8f11d53506ea7ef2fd4cd28581f5eedd9be9e570.zip | |
Merge pull request #2219 from kommen/fix_fragment_caching_squashed
Fix fragment caching (squashed commits)
Diffstat (limited to 'actionpack/lib/action_view')
| -rw-r--r-- | actionpack/lib/action_view/helpers/cache_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/helpers/cache_helper.rb b/actionpack/lib/action_view/helpers/cache_helper.rb index f81ce3e31c..850dd5f448 100644 --- a/actionpack/lib/action_view/helpers/cache_helper.rb +++ b/actionpack/lib/action_view/helpers/cache_helper.rb @@ -54,7 +54,7 @@ module ActionView output_safe = output_buffer.html_safe? fragment = output_buffer.slice!(pos..-1) if output_safe - self.output_buffer = output_buffer.html_safe + self.output_buffer = output_buffer.class.new(output_buffer) end controller.write_fragment(name, fragment, options) end |