This commit is contained in:
Tom Hughes 2011-12-15 21:26:51 +00:00
parent ce829bcc7c
commit 9d94d41376

View file

@ -271,17 +271,17 @@ class ChangesetController < ApplicationController
user = @user user = @user
if user if user
friend_ids = [] friend_ids = []
user.friends.each do |friend| user.friends.each do |friend|
friend_user = User.find(friend.friend_user_id) friend_user = User.find(friend.friend_user_id)
if friend_user.data_public? if friend_user.data_public?
friend_ids << friend.friend_user_id friend_ids << friend.friend_user_id
end end
end end
if friend_ids.length > 0 if friend_ids.length > 0
conditions = cond_merge conditions, ['user_id in (?)', friend_ids] conditions = cond_merge conditions, ['user_id in (?)', friend_ids]
else else
conditions = cond_merge conditions, ['false'] conditions = cond_merge conditions, ['false']
end end
elsif request.format == :html elsif request.format == :html
@title = t 'user.no_such_user.title' @title = t 'user.no_such_user.title'
render :template => 'user/no_such_user', :status => :not_found render :template => 'user/no_such_user', :status => :not_found