Merge branch 'master' into notes

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

diff --git a/app/models/user_sweeper.rb b/app/models/user_sweeper.rb
index 9123c1e04a4e0ebd7e04217ff5a7cca8015b08c2..8ce48e5b34d6032e5332bba954fe75695f528259 100644 (file)
--- a/app/models/user_sweeper.rb
+++ b/app/models/user_sweeper.rb
@@ -16,7 +16,7 @@ private
         (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)
@@ -34,7 +34,6 @@ private
       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)
         expire_action(:controller => 'trace', :action => 'view', :display_name => old_record.display_name, :id => trace.id)
 
         trace.tags.each do |tag|