From: Tom Hughes <tom@compton.nu>
Date: Sat, 14 Jan 2012 13:27:23 +0000 (+0000)
Subject: Explicitly specify the format when expiring RSS feeds
X-Git-Tag: live~5917
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d1727377a817ca66acb65b5c854dad35aed19ac1

Explicitly specify the format when expiring RSS feeds
---

diff --git a/app/models/diary_sweeper.rb b/app/models/diary_sweeper.rb
index 9f739cf5e..e7fd03057 100644
--- a/app/models/diary_sweeper.rb
+++ b/app/models/diary_sweeper.rb
@@ -27,9 +27,9 @@ private
     expire_action(:controller => 'diary_entry', :action => 'list', :language => entry.language_code, :display_name => nil)
     expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => entry.user.display_name)
 
-    expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => nil)
-    expire_action(:controller => 'diary_entry', :action => 'rss', :language => entry.language_code, :display_name => nil)
-    expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => entry.user.display_name)
+    expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => nil, :display_name => nil)
+    expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => entry.language_code, :display_name => nil)
+    expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => nil, :display_name => entry.user.display_name)
 
     if record.is_a?(DiaryEntry)
       expire_fragment(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id, :part => "location")
diff --git a/app/models/user_sweeper.rb b/app/models/user_sweeper.rb
index 7e420ae40..9123c1e04 100644
--- a/app/models/user_sweeper.rb
+++ b/app/models/user_sweeper.rb
@@ -20,7 +20,7 @@ private
       old_record.diary_entries.each do |entry|
         expire_action(:controller => 'diary_entry', :action => 'view', :display_name => old_record.display_name, :id => entry.id)
         expire_action(:controller => 'diary_entry', :action => 'list', :language => entry.language_code, :display_name => nil)
-        expire_action(:controller => 'diary_entry', :action => 'rss', :language => entry.language_code, :display_name => nil)
+        expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => entry.language_code, :display_name => nil)
       end
 
       old_record.diary_comments.each do |comment|
@@ -30,8 +30,8 @@ private
       expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => nil)
       expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => old_record.display_name)
 
-      expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => nil)
-      expire_action(:controller => 'diary_entry', :action => 'rss', :language => nil, :display_name => old_record.display_name)
+      expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => nil, :display_name => nil)
+      expire_action(:controller => 'diary_entry', :action => 'rss', :format => :rss, :language => nil, :display_name => old_record.display_name)
 
       old_record.traces.each do |trace|
         expire_action(:controller => 'trace', :action => 'view', :id => trace.id)