Merge branch 'master' into terms

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

diff --git a/app/models/user_sweeper.rb b/app/models/user_sweeper.rb
index 84373be74384ecf1ad80dc9135890cb5d04aabaa..d2fd983f76221d56215eab4c315763ffda02e374 100644 (file)
--- a/app/models/user_sweeper.rb
+++ b/app/models/user_sweeper.rb
@@ -14,10 +14,10 @@ private
   def expire_cache_for(old_record, new_record)
     if old_record and
         (new_record.nil? or
-         old_record.visible != new_record.visible or
+         old_record.visible? != new_record.visible? or
          old_record.display_name != new_record.display_name)
       old_record.diary_entries.each do |entry|
-        expire_action(:controller => 'diary_entry', :action => 'view', :id => entry.id)
+        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)
       end