From a1c3a6dc1ed366fe406958fe0d1b4e1cd97d82fd Mon Sep 17 00:00:00 2001 From: MrZYX Date: Sat, 2 Apr 2011 15:53:11 +0200 Subject: [PATCH] lets see if that fixes the build --- app/controllers/people_controller.rb | 4 ++-- lib/diaspora/user/querying.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/people_controller.rb b/app/controllers/people_controller.rb index 5aed0af7a..4bd76a6b5 100644 --- a/app/controllers/people_controller.rb +++ b/app/controllers/people_controller.rb @@ -91,10 +91,10 @@ class PeopleController < ApplicationController else @commenting_disabled = false end - @posts = current_user.posts_from(@person).where(:type => "StatusMessage").paginate(:per_page => 15, :page => params[:page]) + @posts = current_user.posts_from(@person).where(:type => "StatusMessage").includes(:comments).paginate(:per_page => 15, :page => params[:page]) else @commenting_disabled = true - @posts = @person.posts.where(:type => "StatusMessage", :public => true).paginate(:per_page => 15, :page => params[:page], :order => 'created_at DESC') + @posts = @person.posts.where(:type => "StatusMessage", :public => true).includes(:comments).paginate(:per_page => 15, :page => params[:page], :order => 'created_at DESC') end @fakes = PostsFake.new(@posts) diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb index 717c33030..681c669fc 100644 --- a/lib/diaspora/user/querying.rb +++ b/lib/diaspora/user/querying.rb @@ -48,7 +48,7 @@ module Diaspora end def contact_for_person_id(person_id) - Contact.unscoped.where(:user_id => self.id, :person_id => person_id).first if person_id + Contact.unscoped.where(:user_id => self.id, :person_id => person_id).includes(:person => :profile).first if person_id end def people_in_aspects(requested_aspects, opts={})