Renames WikiFormatting.cache to .cache_store

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3374 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 21e8be66be32d5449c197ca4226c126cd5efa2c8..c62a3ef01dc9795d3bf07c8ed296f62ec5c93fba 100644 (file)
--- 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