diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-01-12 21:19:10 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-01-12 21:19:10 +0100 |
| commit | 8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e (patch) | |
| tree | 68afb497f317dab1652defe0f96bd20051b572cf /actionpack/lib/action_controller | |
| parent | 5bc98c9510a369a22b856cbe952d640f3825bb5c (diff) | |
| parent | 31293ba9d33f5b5f62ee760a548b4f5438183f22 (diff) | |
| download | rails-8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e.tar.gz rails-8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e.tar.bz2 rails-8b293e99ff2da0b5a60ff7bc5cde7bda9a2f715e.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/caching/fragments.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/caching/fragments.rb b/actionpack/lib/action_controller/caching/fragments.rb index 88f973e62d..0be04b70a1 100644 --- a/actionpack/lib/action_controller/caching/fragments.rb +++ b/actionpack/lib/action_controller/caching/fragments.rb @@ -59,7 +59,7 @@ module ActionController #:nodoc: key = fragment_cache_key(key) instrument_fragment_cache :write_fragment, key do - content = content.html_safe.to_str if content.respond_to?(:html_safe) + content = content.to_str cache_store.write(key, content, options) end content |