Revert en-GB.yml to master.

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

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index 17173d536612fdbba32887b1d766a651e3ffee45..8a0fd8f03a98eb67b8e91f91bb72a6a1898dc796 100644 (file)
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,7 +1,9 @@
 # Be sure to restart your server when you modify this file.
 
 if defined?(MEMCACHE_SERVERS)
 # Be sure to restart your server when you modify this file.
 
 if defined?(MEMCACHE_SERVERS)

-  OpenStreetMap::Application.config.session_store :mem_cache_store, :memcache_server => MEMCACHE_SERVERS, :namespace => "rails:session", :key => "_osm_session"
+  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

-  OpenStreetMap::Application.config.session_store :cache_store, :key => '_osm_session'
+  Rails.application.config.session_store :cookie_store, :key => "_osm_session"

 end
 end