Merge branch 'master' into notes

[rails.git] / app / models / diary_sweeper.rb

diff --git a/app/models/diary_sweeper.rb b/app/models/diary_sweeper.rb
index 9f739cf5e7af761b2390027d824d968a5b63c02d..e7fd030573070df91c56a166b3843acf46628cee 100644 (file)
--- 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")