From: Tom Hughes Date: Sat, 7 Jan 2012 11:51:59 +0000 (+0000) Subject: No need to restrict friend's diary entries to public users X-Git-Tag: live~5904 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/c3f73a80287b35a43ca15d83c9cb2b70606ce7c5 No need to restrict friend's diary entries to public users --- diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb index 5e4b68b73..2fd239a06 100644 --- a/app/controllers/diary_entry_controller.rb +++ b/app/controllers/diary_entry_controller.rb @@ -103,7 +103,7 @@ class DiaryEntryController < ApplicationController @title = t 'diary_entry.list.title_friends' @entry_pages, @entries = paginate(:diary_entries, :include => :user, :conditions => { - :user_id => @user.friend_users.public, + :user_id => @user.friend_users, :visible => true }, :order => 'created_at DESC',