cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge 19601:19888 of rails_port into the openID branch

Browse source
This commit is contained in:
Kai Krueger 2010-02-06 13:13:52 +00:00
commit 17a7c69e8d
40 changed files with 2121 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/diary_sweeper.rb
View file

@ -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)

2
app/models/user_sweeper.rb
View file

@ -17,7 +17,7 @@ private
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