Merge branch 'master' into openstreetbugs

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

diff --git a/app/models/diary_sweeper.rb b/app/models/diary_sweeper.rb
index 0fce2c81966a9ce85f3137813c98cead3cb0f107..59d578f7e6737d9676a04ef6353500b18bf22f37 100644 (file)
--- a/app/models/diary_sweeper.rb
+++ b/app/models/diary_sweeper.rb
@@ -21,7 +21,7 @@ private
     when record.is_a?(DiaryComment): entry = record.diary_entry
     end
 
-    expire_action(:controller => 'diary_entry', :action => 'view', :id => entry.id)
+    expire_action(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id)
 
     expire_action(:controller => 'diary_entry', :action => 'list', :language => nil, :display_name => nil)
     expire_action(:controller => 'diary_entry', :action => 'list', :language => entry.language_code, :display_name => nil)
@@ -30,5 +30,9 @@ private
     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)
+
+    if record.is_a?(DiaryEntry)
+      expire_fragment(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id, :part => "location")
+    end
   end
 end