diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-11 15:18:24 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-11 15:18:24 +0100 |
| commit | a9eebde8561df5c7c34669587c9e25e8baeeeabb (patch) | |
| tree | 27f1f2b8642f94db9d386cfb5866ffd471354f02 /actionpack/lib/action_controller/caching/fragments.rb | |
| parent | c1239e6509d27f88db2fc59189fd9a95333283e1 (diff) | |
| parent | 02bbde4e78f958d5495c19d953aaec58bb8ef998 (diff) | |
| download | rails-a9eebde8561df5c7c34669587c9e25e8baeeeabb.tar.gz rails-a9eebde8561df5c7c34669587c9e25e8baeeeabb.tar.bz2 rails-a9eebde8561df5c7c34669587c9e25e8baeeeabb.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/caching/fragments.rb')
| -rw-r--r-- | actionpack/lib/action_controller/caching/fragments.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb index 806e6a1750..00a7f034d3 100644 --- a/actionpack/lib/action_controller/caching/fragments.rb +++ b/actionpack/lib/action_controller/caching/fragments.rb @@ -36,8 +36,8 @@ module ActionController #:nodoc: def fragment_for(buffer, name = {}, options = nil, &block) #:nodoc: if perform_caching - if fragment_exist?(name,options) - buffer.concat(read_fragment(name, options).html_safe!) + if fragment_exist?(name, options) + buffer.safe_concat(read_fragment(name, options)) else pos = buffer.length block.call |