Include useful URLs in note responses

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

diff --git a/app/models/user_sweeper.rb b/app/models/user_sweeper.rb
index 7e420ae40b42684d4acdbf0dde025ad243dc2c57..8ce48e5b34d6032e5332bba954fe75695f528259 100644 (file)
--- a/app/models/user_sweeper.rb
+++ b/app/models/user_sweeper.rb
@@ -16,11 +16,11 @@ private
         (new_record.nil? or
          old_record.visible? != new_record.visible? or
          old_record.display_name != new_record.display_name or
         (new_record.nil? or
          old_record.visible? != new_record.visible? or
          old_record.display_name != new_record.display_name or

-         old_record.image != new_record.image)
+         old_record.image.fingerprint != new_record.image.fingerprint)

       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)
       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|
       end
 
       old_record.diary_comments.each do |comment|


@@ -30,11 +30,10 @@ 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 => '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|
 
       old_record.traces.each do |trace|

-        expire_action(:controller => 'trace', :action => 'view', :id => trace.id)

         expire_action(:controller => 'trace', :action => 'view', :display_name => old_record.display_name, :id => trace.id)
 
         trace.tags.each do |tag|
         expire_action(:controller => 'trace', :action => 'view', :display_name => old_record.display_name, :id => trace.id)
 
         trace.tags.each do |tag|