From 8219db5ee25342ae53bfdcc511b00058121ebb42 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Thu, 4 Jan 2007 21:43:24 +0000 Subject: rollback [5833] and [5835] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5838 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/caching.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'actionpack/lib/action_controller/caching.rb') diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 39c57206e7..c7f3e95617 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -307,16 +307,16 @@ module ActionController #:nodoc: def self.included(base) #:nodoc: base.class_eval do @@fragment_cache_store = MemoryStore.new - cattr_writer :fragment_cache_store + cattr_reader :fragment_cache_store - def self.fragment_cache_store - @@fragment_cache_store = if @@fragment_cache_store.is_a?(Array) - store, *parameters = *([ @@fragment_cache_store ].flatten) + def self.fragment_cache_store=(store_option) + store, *parameters = *([ store_option ].flatten) + @@fragment_cache_store = if store.is_a?(Symbol) store_class_name = (store == :drb_store ? "DRbStore" : store.to_s.camelize) store_class = ActionController::Caching::Fragments.const_get(store_class_name) store_class.new(*parameters) else - @@fragment_cache_store + store end end end -- cgit v1.2.3