public
Description: Ruby on Rails
Homepage: http://rubyonrails.org
Clone URL: git://github.com/rails/rails.git
Search Repo:
apply [5835] to 1.2 RC branch

git-svn-id: 
http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5836 
5ecf4fe2-1ee6-0310-87b1-e25e094e27de
technoweenie (author)
Thu Jan 04 13:31:48 -0800 2007
commit  21e4825596db063349f1b3637c5ced1f5cef4ae4
tree    69ef507594cc562c223bd3cc52115654649f861a
parent  622d70a11eb3e110682803509822e2bfb8a9d8bb
...
1
2
3
 
4
5
6
...
1
2
 
3
4
5
6
0
@@ -1,6 +1,6 @@
0
 *1.13.0 RC2*
0
 
0
-* Allow ActionController::Base.session_store _store to lazily load the session class to allow for custom session store plugins. [Rick Olson]
0
+* Allow ActionController::Base.session_store and #fragment_cache_store to lazily load the session class to allow for custom session store plugins. [Rick Olson]
0
 
0
 * Make sure html_document is reset between integration test requests. [ctm]
0
 
...
307
308
309
310
 
311
312
313
314
 
 
 
315
316
317
318
319
 
320
321
322
...
307
308
309
 
310
311
 
 
 
312
313
314
315
316
317
318
 
319
320
321
322
0
@@ -307,16 +307,16 @@
0
       def self.included(base) #:nodoc:
0
         base.class_eval do
0
           @@fragment_cache_store = MemoryStore.new
0
- cattr_reader :fragment_cache_store
0
+ cattr_writer :fragment_cache_store
0
 
0
- def self.fragment_cache_store=(store_option)
0
- store, *parameters = *([ store_option ].flatten)
0
- @@fragment_cache_store = if store.is_a?(Symbol)
0
+ def self.fragment_cache_store
0
+ @@fragment_cache_store = if @@fragment_cache_store.is_a?(Array)
0
+ store, *parameters = *([ @@fragment_cache_store ].flatten)
0
               store_class_name = (store == :drb_store ? "DRbStore" : store.to_s.camelize)
0
               store_class = ActionController::Caching::Fragments.const_get(store_class_name)
0
               store_class.new(*parameters)
0
             else
0
- store
0
+ @@fragment_cache_store
0
             end
0
           end
0
         end

Comments

    No one has commented yet.