diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/redmine/wiki_formatting.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb index 21e8be66b..c62a3ef01 100644 --- a/lib/redmine/wiki_formatting.rb +++ b/lib/redmine/wiki_formatting.rb @@ -44,10 +44,10 @@ module Redmine end def to_html(format, text, options = {}, &block) - text = if Setting.cache_formatted_text? && text.size > 2.kilobyte && cache && cache_key = cache_key_for(format, options[:object], options[:attribute]) + text = if Setting.cache_formatted_text? && text.size > 2.kilobyte && cache_store && cache_key = cache_key_for(format, options[:object], options[:attribute]) # Text retrieved from the cache store may be frozen # We need to dup it so we can do in-place substitutions with gsub! - cache.fetch cache_key do + cache_store.fetch cache_key do formatter_for(format).new(text).to_html end.dup else @@ -67,7 +67,7 @@ module Redmine end # Returns the cache store used to cache HTML output - def cache + def cache_store ActionController::Base.cache_store end |