X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/bd402599f541e3da86036f21d955b6e6fc31185c..8f1676b71ae32eca2706b582f65bcefec2285976:/config/initializers/session_store.rb

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 97886ab3e..8a0fd8f03 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -2,6 +2,8 @@
 
 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
-  Rails.application.config.session_store :cache_store, :key => '_osm_session'
+  Rails.application.config.session_store :cookie_store, :key => "_osm_session"
 end