Preserve background colour when marking messages read/unread

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

diff --git a/app/models/diary_sweeper.rb b/app/models/diary_sweeper.rb
index 59d578f7e6737d9676a04ef6353500b18bf22f37..e7fd030573070df91c56a166b3843acf46628cee 100644 (file)
--- a/app/models/diary_sweeper.rb
+++ b/app/models/diary_sweeper.rb
@@ -17,8 +17,8 @@ private
 
   def expire_cache_for(record)
     case
 
   def expire_cache_for(record)
     case

-    when record.is_a?(DiaryEntry): entry = record
-    when record.is_a?(DiaryComment): entry = record.diary_entry
+    when record.is_a?(DiaryEntry) then entry = record
+    when record.is_a?(DiaryComment) then entry = record.diary_entry

     end
 
     expire_action(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id)
     end
 
     expire_action(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id)


@@ -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 => '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")
 
     if record.is_a?(DiaryEntry)
       expire_fragment(:controller => 'diary_entry', :action => 'view', :display_name => entry.user.display_name, :id => entry.id, :part => "location")