Switch to using i18n-js for handling translations in javascript

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

diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index a9afad2d644d2433c813c488af2fa60ee36c6027..aa90714049818f297915f7a1853aa4335b81626f 100644 (file)
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -1,8 +1,9 @@
 # Be sure to restart your server when you modify this file.
 
 # Be sure to restart your server when you modify this file.
 

-if STATUS == :database_offline or STATUS == :database_readonly
-  OpenStreetMap::Application.config.session_store :cookie_store, :key => '_osm_session'
+if defined?(MEMCACHE_SERVERS)
+  cache = MemCache.new(:namespace => "rails:session", :string_return_types => true)
+
+  OpenStreetMap::Application.config.session_store :mem_cache_store, :cache => cache, :key => "_osm_session"

 else
 else

-  ActiveRecord::SessionStore.session_class = ActiveRecord::SessionStore::SqlBypass
-  OpenStreetMap::Application.config.session_store :active_record_store, :key => '_osm_session'
+  OpenStreetMap::Application.config.session_store :cache_store, :key => '_osm_session'

 end
 end