0
@@ -1,7 +1,5 @@
0
 *1.13.0 RC2*
0
 
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
 
0
 * Set session to an empty hash if :new_session => false and no session cookie or param is present. CGI::Session was raising an unrescued ArgumentError.  [Josh Susser]

0
@@ -307,16 +307,16 @@
0
       def self.included(base) #:nodoc:
0
         base.class_eval do
0
           @@fragment_cache_store = MemoryStore.new
0
-          cattr_writer :fragment_cache_store
0
+          cattr_reader :fragment_cache_store
0
 
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
+          def self.fragment_cache_store=(store_option)
0
+            store, *parameters = *([ store_option ].flatten)
0
+            @@fragment_cache_store = if store.is_a?(Symbol)
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
-              @@fragment_cache_store
0
+              store
0
             end
0
           end
0
         end

0
@@ -18,13 +18,13 @@
0
       # file system, but you can also specify one of the other included stores (:active_record_store, :drb_store, 
0
       # :mem_cache_store, or :memory_store) or use your own class.
0
       def session_store=(store)
0
-        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] = store
0
+        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] =
0
+          store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store
0
       end
0
 
0
       # Returns the session store class currently used.
0
       def session_store
0
-        store = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
0
-        self.session_store = store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : store.to_s.camelize) : store
0
+        ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager]
0
       end
0
 
0
       # Returns the hash used to configure the session. Example use: