diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-10 18:13:43 -0800 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-01-10 18:13:43 -0800 |
commit | 5ddc597066603875b4e59c811d0d78c84842111c (patch) | |
tree | 782cfdbb121ce932adebee375c82d06e9a4d1841 /actionpack/lib/action_controller | |
parent | d2e7c1b97d1c2152eeb0669fe0b88989a087246c (diff) | |
download | rails-5ddc597066603875b4e59c811d0d78c84842111c.tar.gz rails-5ddc597066603875b4e59c811d0d78c84842111c.tar.bz2 rails-5ddc597066603875b4e59c811d0d78c84842111c.zip |
Use safe_concat instead of trying to html_safe! what might be a frozen string
Diffstat (limited to 'actionpack/lib/action_controller')
-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 |