From 5bd47f20c11b659c31f5c76523f4a3b75a8e8d7f Mon Sep 17 00:00:00 2001
From: danielgrippi <daniel@joindiaspora.com>
Date: Tue, 29 Mar 2011 19:00:51 -0700
Subject: [PATCH] Only get non-pending posts in posts_from

---
 lib/diaspora/user/querying.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index 6bfa881782..7a01748d85 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -88,8 +88,8 @@ module Diaspora
         if contact = self.contact_for(person)
           post_ids = contact.post_visibilities.select('post_visibilities.post_id').map{|p| p.post_id}
         end
-        post_ids += person.posts.where(:public => true, :pending => false).select('posts.id').map{|p| p.id}
-        Post.where(:id => post_ids).select('DISTINCT `posts`.*').order("posts.created_at DESC")
+        post_ids += person.posts.where(:public => true).select('posts.id').map{|p| p.id}
+        Post.where(:id => post_ids, :pending => false).select('DISTINCT `posts`.*').order("posts.created_at DESC")
       end
     end
   end
-- 
GitLab