kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renames WikiFormatting.cache to .cache_store 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3374 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2010-02-06 13:13:40 +00:00
parent 8fb29d4d21
commit 34ee5eccda
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/redmine/wiki_formatting.rb
View File

@ -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