From 236153dbf594156b7d64c87762f4b794771e39fd Mon Sep 17 00:00:00 2001 From: Ryan Bigg Date: Mon, 3 Jun 2013 14:32:49 -0700 Subject: [PATCH] Include ENV['RAILS_CACHE_ID'] within preference cache keys --- core/app/models/spree/preferences/configuration.rb | 2 +- core/app/models/spree/preferences/preferable.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/app/models/spree/preferences/configuration.rb b/core/app/models/spree/preferences/configuration.rb index 64365a4c5d3..8636c96ed4f 100644 --- a/core/app/models/spree/preferences/configuration.rb +++ b/core/app/models/spree/preferences/configuration.rb @@ -29,7 +29,7 @@ def configure end def preference_cache_key(name) - [self.class.name, name].join('::').underscore + [ENV['RAILS_CACHE_ID'], self.class.name, name].flatten.join('::').underscore end def reset diff --git a/core/app/models/spree/preferences/preferable.rb b/core/app/models/spree/preferences/preferable.rb index 700c2e52a66..a02ab9265d3 100644 --- a/core/app/models/spree/preferences/preferable.rb +++ b/core/app/models/spree/preferences/preferable.rb @@ -78,7 +78,7 @@ def prefers?(name) def preference_cache_key(name) return unless id - [self.class.name, name, id].join('::').underscore + [ENV["RAILS_CACHE_ID"], self.class.name, name, id].join('::').underscore end def save_pending_preferences