Renames WikiFormatting.cache to .cache_store

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

Renames WikiFormatting.cache to .cache_store
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3374 e93f8b46-1217-0410-a6f0-8f06a7374b81
34ee5ecc · Jean-Philippe Lang · 8fb29d4d · 34ee5ecc
Commit 34ee5ecc authored Feb 06, 2010 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

wiki_formatting.rb lib/redmine/wiki_formatting.rb +3 -3

No files found.
--- 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