summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-02-06 13:13:40 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-02-06 13:13:40 +0000
commit34ee5eccda779fed28f775acfb65a65a1e64723f (patch)
tree3c211958c7d2e82c3fddf0ef62e630fd6aa0a4c1
parent8fb29d4d211ac09549cf47fad764b56c9173e938 (diff)
downloadredmine-34ee5eccda779fed28f775acfb65a65a1e64723f.tar.gz
redmine-34ee5eccda779fed28f775acfb65a65a1e64723f.zip
Renames WikiFormatting.cache to .cache_store
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3374 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/redmine/wiki_formatting.rb6
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