From 39b8fed4319b839457c2f4d8b1fbb55de86da767 Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Tue, 15 Mar 2011 14:59:59 -0700 Subject: [PATCH] Change includes aspects to joins aspects --- lib/diaspora/user/querying.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb index 487883a54..fca269bba 100644 --- a/lib/diaspora/user/querying.rb +++ b/lib/diaspora/user/querying.rb @@ -79,7 +79,9 @@ module Diaspora def posts_from(person) asp = Aspect.arel_table p = Post.arel_table - person.posts.includes(:aspects, :comments).where( p[:public].eq(true).or(asp[:user_id].eq(self.id))).select('DISTINCT `posts`.*').order("posts.created_at DESC") + person.posts.joins(:aspects).includes(:comments).where( + p[:public].eq(true).or(asp[:user_id].eq(self.id)) + ).select('DISTINCT `posts`.*').order("posts.created_at DESC") end end end