From: Tom Hughes <tom@compton.nu>
Date: Sat, 3 Mar 2012 12:24:00 +0000 (+0000)
Subject: Use a consistent host name in cache keys
X-Git-Tag: live~5801
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/232e04ab9b068c13042516db269cf5a5654b7912

Use a consistent host name in cache keys
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index ea5d450a4..6caed0594 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -334,7 +334,7 @@ class ApplicationController < ActionController::Base
     end)
 
     options[:cache_path] = Proc.new do |controller|
-      cache_path.merge(controller.params).merge(:locale => I18n.locale)
+      cache_path.merge(controller.params).merge(:host => SERVER_URL, :locale => I18n.locale)
     end
 
     actions.push(options)
@@ -346,7 +346,7 @@ class ApplicationController < ActionController::Base
   # extend expire_action to expire all variants
   def expire_action(options = {})
     I18n.available_locales.each do |locale|
-      super options.merge(:locale => locale)
+      super options.merge(:host => SERVER_URL, :locale => locale)
     end
   end