Merge remote-tracking branch 'upstream/pull/2049'

[rails.git] / config / initializers / session_store.rb

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 8a0fd8f03a98eb67b8e91f91bb72a6a1898dc796..a9c735d6255d40e20cdc2e6eaa5fc206850e6fa0 100644 (file)
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -2,8 +2,6 @@
 
 if defined?(MEMCACHE_SERVERS)
   Rails.application.config.session_store :mem_cache_store, :memcache_server => MEMCACHE_SERVERS, :namespace => "rails:session", :key => "_osm_session"
 
 if defined?(MEMCACHE_SERVERS)
   Rails.application.config.session_store :mem_cache_store, :memcache_server => MEMCACHE_SERVERS, :namespace => "rails:session", :key => "_osm_session"

-elsif Rails.application.config.cache_store != :null_store
-  Rails.application.config.session_store :cache_store, :key => "_osm_session"

 else
 else

-  Rails.application.config.session_store :cookie_store, :key => "_osm_session"
+  Rails.application.config.session_store :cache_store, :key => "_osm_session", :cache => ActiveSupport::Cache::MemoryStore.new

 end
 end